diff --git a/cpu_ref/Android.bp b/cpu_ref/Android.bp
index 7d76d66..37db140 100644
--- a/cpu_ref/Android.bp
+++ b/cpu_ref/Android.bp
@@ -54,6 +54,7 @@
 
         arm: {
             cflags: [
+                "-DARCH_ARM_HAVE_NEON",
                 "-DARCH_ARM_HAVE_VFP",
                 "-DARCH_ARM_USE_INTRINSICS",
             ],
@@ -67,14 +68,6 @@
                 "rsCpuIntrinsics_neon_Resize.S",
                 "rsCpuIntrinsics_neon_YuvToRGB.S",
             ],
-
-            asflags: ["-mfpu=neon"],
-
-            neon: {
-                cflags: [
-                    "-DARCH_ARM_HAVE_NEON",
-                ],
-            },
         },
 
         x86: {
diff --git a/support.bp b/support.bp
index 0732053..81d6dfc 100644
--- a/support.bp
+++ b/support.bp
@@ -111,10 +111,10 @@
     arch: {
         arm: {
             cflags: [
+                "-DARCH_ARM_HAVE_NEON",
                 "-DARCH_ARM_HAVE_VFP",
                 "-DARCH_ARM_USE_INTRINSICS",
             ],
-            asflags: ["-mfpu=neon"],
             srcs: [
                 "cpu_ref/rsCpuIntrinsics_neon_3DLUT.S",
                 "cpu_ref/rsCpuIntrinsics_neon_Blend.S",
@@ -124,10 +124,6 @@
                 "cpu_ref/rsCpuIntrinsics_neon_Resize.S",
                 "cpu_ref/rsCpuIntrinsics_neon_YuvToRGB.S",
             ],
-
-            neon: {
-                cflags: ["-DARCH_ARM_HAVE_NEON"]
-            },
         },
 
         arm64: {