[automerger skipped] Merge "Emit LOCAL_MODULE_TARGET_ARCH for prebuilt_etc" into qt-dev
am: 92304882 -s ours
am skip reason: change_id Idd28443d129ff70053295015e69328a8fa3eca47 with SHA1 9aa3ab1f is in history
Change-Id: I7a9ff352773fa4f7c586aa10cd22b73d3eda8eca