DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ib97781dd4ee5e719cc2376221708bb1c8aaeaf73
diff --git a/tests/Android.bp b/tests/Android.bp
index 4477b52..f0fe5e6 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -38,6 +38,12 @@
         // For glibc.
         "-D__STDC_LIMIT_MACROS",
     ],
+    // Make the bionic tests implicitly test bionic's shadow call stack support.
+    arch: {
+        arm64: {
+           cflags: ["-fsanitize=shadow-call-stack"],
+        },
+    },
     stl: "libc++",
     sanitize: {
         address: false,