Snap for 12335440 from bf6e6f22 to 24Q4-release

Change-Id: I9f1c1f7f7ad5008bfd314e7aec6e4fc164771a93

Android.bp

@@ -774,7 +774,9 @@ cc_library_static {
     visibility: ["//visibility:private"],
 
     cflags: [
-        "-march=armv8-a+crc",
+        "-Xclang -target-feature",
+        // This comment prevents bpfmt from sorting the flags incorrectly.
+        "-Xclang +crc",
     ],
 
     arch: {
@@ -792,7 +794,9 @@ cc_library_static {
     visibility: ["//visibility:private"],
 
     cflags: [
-        "-march=armv8.2-a+dotprod",
+        "-Xclang -target-feature",
+        // This comment prevents bpfmt from sorting the flags incorrectly.
+        "-Xclang +dotprod",
     ],
 
     arch: {

Android.bp.in

@@ -95,7 +95,9 @@ cc_library_static {
     visibility: ["//visibility:private"],
 
     cflags: [
-        "-march=armv8-a+crc",
+        "-Xclang -target-feature",
+        // This comment prevents bpfmt from sorting the flags incorrectly.
+        "-Xclang +crc",
     ],
 
     arch: {
@@ -113,7 +115,9 @@ cc_library_static {
     visibility: ["//visibility:private"],
 
     cflags: [
-        "-march=armv8.2-a+dotprod",
+        "-Xclang -target-feature",
+        // This comment prevents bpfmt from sorting the flags incorrectly.
+        "-Xclang +dotprod",
     ],
 
     arch: {