Enable neon-optimized functions

Change-Id: I0d5894e0b71aefa7d8d30c943aa6d0698b38fb8f
Signed-off-by: Hendrik Dahlkamp <hendrik@google.com>
diff --git a/Android.mk b/Android.mk
index d1c565b..7010fe8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,13 +22,13 @@
 
 common_CFLAGS := -Wall -fexceptions
 
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+ifeq ($(TARGET_ARCH_VARIANT),armv7-a-neon)
     common_CFLAGS += -DLIBYUV_NEON
     common_SRC_FILES += \
-        files/source/compare_neon.cc.neon \
-        files/source/rotate_neon.cc.neon \
-        files/source/row_neon.cc.neon \
-        files/source/scale_neon.cc.neon
+        files/source/compare_neon.cc \
+        files/source/rotate_neon.cc \
+        files/source/row_neon.cc \
+        files/source/scale_neon.cc
 endif
 
 common_C_INCLUDES = $(LOCAL_PATH)/files/include