diff --git a/libc/Android.bp b/libc/Android.bp
index 62ac512..d2b23eb 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -72,7 +72,6 @@
         never: true,
     },
     native_coverage: false,
-    clang: true,
 }
 
 // ANDROIDMK TRANSLATION ERROR: unsupported directive
@@ -1979,7 +1978,6 @@
             local_include_dirs: ["arch-x86_64/include"],
         },
     },
-    clang: true,
 }
 
 cc_defaults {
diff --git a/tests/Android.bp b/tests/Android.bp
index 6b96e24..075822a 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -218,13 +218,11 @@
     // Ignore that we don't have ASAN symbols linked in.
     allow_undefined_symbols: true,
     srcs: ["fortify_compilation_test.cpp"],
-    clang: true,
 }
 
 cc_test_library {
     name: "libfortify1-tests-clang",
     defaults: ["bionic_fortify_tests_defaults", "bionic_tests_defaults"],
-    clang: true,
     cflags: [
         "-D_FORTIFY_SOURCE=1",
         "-DTEST_NAME=Fortify1_clang"
@@ -237,7 +235,6 @@
 cc_test_library {
     name: "libfortify2-tests-clang",
     defaults: ["bionic_fortify_tests_defaults", "bionic_tests_defaults"],
-    clang: true,
     cflags: [
         "-D_FORTIFY_SOURCE=2",
         "-DTEST_NAME=Fortify2_clang"
@@ -426,7 +423,6 @@
 cc_test {
     name: "bionic-unit-tests",
     defaults: ["bionic_unit_tests_defaults", "bionic_tests_defaults"],
-    clang: true,
 
     target: {
         android: {