Merge "libc_header is available to any apex but only visible to certain places"
diff --git a/libc/Android.bp b/libc/Android.bp
index 49654b3..650726a 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1777,9 +1777,15 @@
     native_bridge_supported: true,
     apex_available: [
         "//apex_available:platform",
-        "com.android.runtime",
-        "com.android.art.debug",
-        "com.android.art.release",
+        "//apex_available:anyapex",
+    ],
+    visibility: [
+        ":__subpackages__", // visible to bionic
+        // ... and only to these places (b/152668052)
+        "//external/gwp_asan",
+        "//external/libunwind_llvm",
+        "//system/core/property_service/libpropertyinfoparser",
+        "//system/extras/toolchain-extras",
     ],
 
     no_libcrt: true,