Merge "rs: remove one last `neon:` from the build!" into main am: b51dc343d5 am: eab7ebb2ba

Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/3029783

Change-Id: Id5a6f9cadf10709855174d142b3fabfe12d9b641
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index 0cd395b..9bfd264 100644
--- a/Android.bp
+++ b/Android.bp
@@ -258,18 +258,15 @@
     ],
 
     arch: {
+        arm: {
+            required: ["libclcore_neon.bc"],
+        },
         x86: {
             required: ["libclcore_x86.bc"],
         },
         x86_64: {
             required: ["libclcore_x86.bc"],
         },
-
-        arm: {
-            neon: {
-                required: ["libclcore_neon.bc"],
-            },
-        },
     },
 
     product_variables: {