[automerger skipped] Merge "Merge Android R" am: a81b123780 -s ours am: 888d0531c2 -s ours

am skip reason: Change-Id Idd09cd2ecd3045625f3c10c41cad2f2af7850dd5 with SHA-1 7e7631299c is in history

Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/1422390

Change-Id: Ib0c50876af4b3c31cfc3a97cdaf2a9dd4c66e58f
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"],