Merge "bug_24465209_workaround shouldn't affect the host." into main

Author: enh-google

libc/Android.bp

@@ -120,12 +120,12 @@ cc_defaults {
 // ========================================================
 cc_defaults {
     name: "bug_24465209_workaround",
-    arch: {
-        arm: {
+    target: {
+        android_arm: {
             pack_relocations: false,
             ldflags: ["-Wl,--hash-style=both"],
         },
-        x86: {
+        android_x86: {
             pack_relocations: false,
             ldflags: ["-Wl,--hash-style=both"],
         }