Merge "Explicitly set LOCAL_MODULE_TARGET_ARCH"