diff --git a/apex/Android.bp b/apex/Android.bp
index 8aec64a..e0a8753 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -42,6 +42,7 @@
     prebuilts: [
         "bionic-linker-config",
     ],
+    updatable: false,
 }
 
 sdk {
diff --git a/benchmarks/linker_relocation/Android.bp b/benchmarks/linker_relocation/Android.bp
index 6955c67..f8ef9e0 100644
--- a/benchmarks/linker_relocation/Android.bp
+++ b/benchmarks/linker_relocation/Android.bp
@@ -28,6 +28,7 @@
     name: "linker_reloc_bench_headers",
     defaults: ["bionic_spawn_benchmark_targets"],
     export_include_dirs: ["include"],
+    bazel_module: { bp2build_available: true },
 }
 
 // TODO: This benchmark doesn't work with TradeFed/atest because it doesn't copy its test libraries
diff --git a/libc/Android.bp b/libc/Android.bp
index 6ba60ca..6a3a7c0 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1823,6 +1823,7 @@
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
+    bazel_module: { bp2build_available: true },
 }
 
 cc_library_headers {
@@ -1880,6 +1881,7 @@
             export_system_include_dirs: ["kernel/uapi/asm-x86"],
         },
     },
+    bazel_module: { bp2build_available: true },
 }
 
 cc_library_headers {
@@ -1929,7 +1931,8 @@
             header_libs: ["libc_headers_arch"],
             export_header_lib_headers: ["libc_headers_arch"],
         },
-    }
+    },
+    bazel_module: { bp2build_available: true },
 }
 
 // ========================================================
diff --git a/libc/async_safe/Android.bp b/libc/async_safe/Android.bp
index 66389b9..222d9f6 100644
--- a/libc/async_safe/Android.bp
+++ b/libc/async_safe/Android.bp
@@ -47,4 +47,5 @@
         "//apex_available:platform",
         "com.android.runtime",
     ],
+    bazel_module: { bp2build_available: true },
 }
diff --git a/libc/include/android/legacy_signal_inlines.h b/libc/include/android/legacy_signal_inlines.h
index e968c45..95c2320 100644
--- a/libc/include/android/legacy_signal_inlines.h
+++ b/libc/include/android/legacy_signal_inlines.h
@@ -50,7 +50,7 @@
    * can't use __builtin_available, but the platform builds with -Werror=unguarded-availability so
    * it requires __builtin_available.
    */
-#if defined(__ANDROID_UNGUARDED_AVAILABILITY__)
+#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
   if (__builtin_available(android 21, *)) {
 #else
   if (__libc_current_sigrtmax) {
@@ -66,7 +66,7 @@
    * can't use __builtin_available, but the platform builds with -Werror=unguarded-availability so
    * it requires __builtin_available.
    */
-#if defined(__ANDROID_UNGUARDED_AVAILABILITY__)
+#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
   if (__builtin_available(android 21, *)) {
 #else
   if (__libc_current_sigrtmin) {
diff --git a/libc/include/android/versioning.h b/libc/include/android/versioning.h
index 54ffc91..214acf2 100644
--- a/libc/include/android/versioning.h
+++ b/libc/include/android/versioning.h
@@ -49,22 +49,19 @@
 // allows libc++ to refer to these functions in inlines without needing to guard them, needed since
 // libc++ doesn't currently guard these calls. There's no risk to the apps though because using
 // those APIs will still cause a link error.
-#if defined(__ANDROID_UNGUARDED_AVAILABILITY__)
-#define __MAYBE_STRICT
+#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
+#define __BIONIC_AVAILABILITY(__what) __attribute__((__availability__(android,__what)))
 #define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level) __INTRODUCED_IN_X86(api_level)
 #define __INTRODUCED_IN_X86_NO_GUARD_FOR_NDK(api_level) __INTRODUCED_IN_X86(api_level)
 #else
-#define __MAYBE_STRICT ,strict
+#define __BIONIC_AVAILABILITY(__what) __attribute__((__availability__(android,strict,__what)))
 #define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level)
 #define __INTRODUCED_IN_X86_NO_GUARD_FOR_NDK(api_level)
 #endif
 
-#define __INTRODUCED_IN(api_level) \
-    __attribute__((availability(android __MAYBE_STRICT,introduced=api_level)))
-#define __DEPRECATED_IN(api_level) \
-    __attribute__((availability(android __MAYBE_STRICT,deprecated=api_level)))
-#define __REMOVED_IN(api_level) \
-    __attribute__((availability(android __MAYBE_STRICT,obsoleted=api_level)))
+#define __INTRODUCED_IN(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
+#define __DEPRECATED_IN(api_level) __BIONIC_AVAILABILITY(deprecated=api_level)
+#define __REMOVED_IN(api_level) __BIONIC_AVAILABILITY(obsoleted=api_level)
 
 // The same availability attribute can't be annotated multiple times. Therefore, the macros are
 // defined for the configuration that it is valid for so that declarations like the below doesn't
@@ -79,23 +76,19 @@
 //
 // hasn't been supported and won't be.
 #if !defined(__LP64__)
-#define __INTRODUCED_IN_32(api_level) \
-    __attribute__((availability(android __MAYBE_STRICT,introduced=api_level)))
+#define __INTRODUCED_IN_32(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
 #define __INTRODUCED_IN_64(api_level)
 #else
 #define __INTRODUCED_IN_32(api_level)
-#define __INTRODUCED_IN_64(api_level) \
-    __attribute__((availability(android __MAYBE_STRICT,introduced=api_level)))
+#define __INTRODUCED_IN_64(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
 #endif
 
 #if defined(__arm__) || defined(__aarch64__)
-#define __INTRODUCED_IN_ARM(api_level) \
-    __attribute__((availability(android __MAYBE_STRICT,introduced=api_level)))
+#define __INTRODUCED_IN_ARM(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
 #define __INTRODUCED_IN_X86(api_level)
 #elif defined(__i386__) || defined(__x86_64__)
 #define __INTRODUCED_IN_ARM(api_level)
-#define __INTRODUCED_IN_X86(api_level) \
-    __attribute__((availability(android __MAYBE_STRICT,introduced=api_level)))
+#define __INTRODUCED_IN_X86(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
 #else
 #define __INTRODUCED_IN_ARM(api_level)
 #define __INTRODUCED_IN_X86(api_level)
diff --git a/linker/ldd b/linker/ldd
old mode 100644
new mode 100755