Merge changes Ic2d48c93,I981ac9bd am: cfede4fdd1
am: 8ff7289157

Change-Id: I3adef3a15551f03b81e800b06e3a4ec2809909a4
diff --git a/tests/Android.bp b/tests/Android.bp
index d65780c..db02d75 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,