Merge "Use correct LOCAL_MODULE_TARGET_ARCH for x86_64" am: 170e6a100b am: fd46044fef am: 67793ab02a
am: 2a8a3b47a4

Change-Id: Ie11829e546c5e3e6a10b5ecedb3dfca1d1e85745