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

Change-Id: I01e5bd543dd40efe83d5ddbb4f366b0a4c183cb4