Merge "build/make/Android.mk: support TARGET_ARCH_ABI=x86_64"