Snap for 11685790 from da5b3109571fdf554033d9c3710a852c0882ee7e to 24Q3-release

Change-Id: I94c46f673e602001c4614d1204a36df4240e3575
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: {