Build the neon intrinsics for arm64-v8a and x86_64 as well

This relies on a change for the NDK build system to recognize and
accept the neon tag in these builds as well.

The intrinsics work just fine in these build configurations.

Change-Id: Ib652ab69e822b56edaa9387400bad326fab10133
diff --git a/ndk/samples/hello-neon/jni/Android.mk b/ndk/samples/hello-neon/jni/Android.mk
index eeaae96..7bb6976 100644
--- a/ndk/samples/hello-neon/jni/Android.mk
+++ b/ndk/samples/hello-neon/jni/Android.mk
@@ -6,7 +6,7 @@
 
 LOCAL_SRC_FILES := helloneon.c
 
-ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI), armeabi-v7a x86))
+ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI), armeabi-v7a x86 x86_64 arm64-v8a))
     LOCAL_CFLAGS := -DHAVE_NEON=1
 ifeq ($(TARGET_ARCH_ABI),x86)
     LOCAL_CFLAGS += -mssse3
diff --git a/ndk/samples/hello-neon/jni/Application.mk b/ndk/samples/hello-neon/jni/Application.mk
index 7985a68..ceeb0b4 100644
--- a/ndk/samples/hello-neon/jni/Application.mk
+++ b/ndk/samples/hello-neon/jni/Application.mk
@@ -1 +1 @@
-APP_ABI := armeabi armeabi-v7a arm64-v8a x86
+APP_ABI := armeabi armeabi-v7a arm64-v8a x86 x86_64