Merge "Fix libgcc/libatomic link order" into master-soong
diff --git a/Android.bp b/Android.bp
index 09acaf9..501e4d5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -210,12 +210,27 @@
 
 toolchain_library {
     name: "libatomic",
+    arch: {
+        arm: {
+            instruction_set: "arm",
+        },
+    },
 }
 
 toolchain_library {
     name: "libgcc",
+    arch: {
+        arm: {
+            instruction_set: "arm",
+        },
+    },
 }
 
 toolchain_library {
     name: "libgcov",
+    arch: {
+        arm: {
+            instruction_set: "arm",
+        },
+    },
 }