Snap for 8303774 from b0dbd53706069619146ce04c7fc34ab08936334d to tm-release

Change-Id: I818ee662cc13ad372c3f6635586bf784407b50c6

Android.bp

diff --git a/Android.bp b/Android.bp
index b52c09e..1f5855a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,7 +122,6 @@
 
 cc_defaults {
     name: "jemalloc5_defaults",
-    defaults: ["linux_bionic_supported"],
     host_supported: true,
     native_bridge_supported: true,
     cflags: common_cflags,
@@ -132,7 +131,7 @@
             cflags: android_common_cflags,
             product_variables: android_product_variables,
         },
-        linux_glibc: {
+        linux_bionic: {
             enabled: true,
         },
     },
@@ -338,8 +337,10 @@
     test_per_src: true,
 
     target: {
-        linux_glibc: {
+        linux_bionic: {
             enabled: true,
+        },
+        linux_glibc: {
             // The sanitizer does not work for these tests on the host.
             sanitize: {
                 never: true,