Merge "Disable branch protection for arm64."
diff --git a/tests/Android.bp b/tests/Android.bp
index f39aff0..d78a204 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -45,7 +45,8 @@
         arm64: {
             cflags: [
                 "-fsanitize=shadow-call-stack",
-                "-mbranch-protection=standard",
+                // Disable this option for now: see b/151372823
+                //"-mbranch-protection=standard",
             ],
         },
     },