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

Change-Id: I004260c20888a8ea58ea763c409a3ebdfa4655b8