Snap for 5176559 from bbd26a90 to qt-release

Change-Id: I6e0983a4ee2ed2e4c0a6edbc0bf106563994dca4

Android.bp

@@ -432,12 +432,13 @@ cc_library_static {
             srcs: libaom_arm64_c_srcs,
         },
 
-        arm: {
+        // configured to require the neon unit
+        arm: { neon: {
             local_include_dirs: [
                 "config/arm/",
             ],
             srcs: libaom_arm_c_srcs,
-        },
+        }, },
 
         x86_64: {
             local_include_dirs: [

Android.bp.in

@@ -21,12 +21,13 @@ cc_library_static {
             srcs: libaom_arm64_c_srcs,
         },
 
-        arm: {
+        // configured to require the neon unit
+        arm: { neon: {
             local_include_dirs: [
                 "config/arm/",
             ],
             srcs: libaom_arm_c_srcs,
-        },
+        }, },
 
         x86_64: {
             local_include_dirs: [