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

Change-Id: I22514e55948f3176868e5097684ab03b39f3867c