Merge "Use std::move() for rvalue-reference setters and ctors" am: 4848b6d7c3 am: 24c8c6e397
am: 13833635ca

Change-Id: I3f553fb80529791c0884d5f4f72c4ec614c854d2
diff --git a/tests/Android.bp b/tests/Android.bp
index ab11d47..c200ef4 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,