Merge "Fix issues with ARM/Thumb linking."
diff --git a/tests/Android.bp b/tests/Android.bp
index a27c234..fa87db4 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -22,6 +22,13 @@
         "-Werror",
     ],
 
+    // Assembly is only written for ARM and cannot interop with Thumb.
+    arch: {
+        arm: {
+            instruction_set: "arm",
+        },
+    },
+
     sanitize: {
         integer_overflow: true,
         misc_undefined: ["bounds"],