Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future

Bug: 337098550
Merged-In: Ic608294cb08d30d6a559d8af2247767b1e5d97b8
Change-Id: I851c7ef686a18290d11cfa31bbbe0c22ecd778cc
diff --git a/renderscript-toolkit/src/main/cpp/Android.bp b/renderscript-toolkit/src/main/cpp/Android.bp
index c3acebf..f7b25d6 100644
--- a/renderscript-toolkit/src/main/cpp/Android.bp
+++ b/renderscript-toolkit/src/main/cpp/Android.bp
@@ -83,6 +83,7 @@
         },
         arm: {
             cflags: [
+                "-DARCH_ARM_HAVE_NEON",
                 "-DARCH_ARM_HAVE_VFP",
                 "-DARCH_ARM_USE_INTRINSICS",
             ],
@@ -95,12 +96,6 @@
                 "Resize_neon.S",
                 "YuvToRgb_neon.S",
             ],
-            asflags: ["-mfpu=neon"],
-            neon: {
-                cflags: [
-                    "-DARCH_ARM_HAVE_NEON",
-                ],
-            },
         },
     },
 }