Merge "Use correct LOCAL_MODULE_TARGET_ARCH for x86_64"