diff --git a/lib/asan/Android.bp b/lib/asan/Android.bp
index e815237..eb9e32e 100644
--- a/lib/asan/Android.bp
+++ b/lib/asan/Android.bp
@@ -154,55 +154,58 @@
     enabled: false,
 }
 
-cc_library_shared {
-    name: "libclang_rt.asan-arm-android",
-    defaults: ["libclang_rt_defaults"],
-    arch: {
-        arm: {
-            enabled: true,
-        },
-    },
-}
-
-cc_library_shared {
-    name: "libclang_rt.asan-aarch64-android",
-    defaults: ["libclang_rt_defaults"],
-    arch: {
-        arm64: {
-            enabled: true,
-        },
-    },
-}
-
-cc_library_shared {
-    name: "libclang_rt.asan-mips-android",
-    defaults: ["libclang_rt_defaults"],
-    arch: {
-        mips: {
-            enabled: true,
-        },
-    },
-}
-
-cc_library_shared {
-    name: "libclang_rt.asan-mips64-android",
-    defaults: ["libclang_rt_defaults"],
-    arch: {
-        mips64: {
-            enabled: true,
-        },
-    },
-}
-
-cc_library_shared {
-    name: "libclang_rt.asan-i686-android",
-    defaults: ["libclang_rt_defaults"],
-    arch: {
-        x86: {
-            enabled: true,
-        },
-    },
-}
+// Disable libclang_rt prebuilts in aosp/master until soong has a build option
+// to pick a prebuilt or compile/build a module.
+//
+// cc_library_shared {
+//     name: "libclang_rt.asan-arm-android",
+//     defaults: ["libclang_rt_defaults"],
+//     arch: {
+//         arm: {
+//             enabled: true,
+//         },
+//     },
+// }
+//
+// cc_library_shared {
+//     name: "libclang_rt.asan-aarch64-android",
+//     defaults: ["libclang_rt_defaults"],
+//     arch: {
+//         arm64: {
+//             enabled: true,
+//         },
+//     },
+// }
+//
+// cc_library_shared {
+//     name: "libclang_rt.asan-mips-android",
+//     defaults: ["libclang_rt_defaults"],
+//     arch: {
+//         mips: {
+//             enabled: true,
+//         },
+//     },
+// }
+//
+// cc_library_shared {
+//     name: "libclang_rt.asan-mips64-android",
+//     defaults: ["libclang_rt_defaults"],
+//     arch: {
+//         mips64: {
+//             enabled: true,
+//         },
+//     },
+// }
+//
+// cc_library_shared {
+//     name: "libclang_rt.asan-i686-android",
+//     defaults: ["libclang_rt_defaults"],
+//     arch: {
+//         x86: {
+//             enabled: true,
+//         },
+//     },
+// }
 
 cc_binary {
     name: "asanwrapper",
diff --git a/lib/ubsan/Android.bp b/lib/ubsan/Android.bp
index 537f83a..ab332e0 100644
--- a/lib/ubsan/Android.bp
+++ b/lib/ubsan/Android.bp
@@ -106,65 +106,68 @@
     enabled: false,
 }
 
-cc_library_shared {
-    name: "libclang_rt.ubsan_standalone-arm-android",
-    defaults: ["libclang_rt_ubsan_defaults"],
-    arch: {
-        arm: {
-            enabled: true,
-        },
-    },
-}
-
-cc_library_shared {
-    name: "libclang_rt.ubsan_standalone-aarch64-android",
-    defaults: ["libclang_rt_ubsan_defaults"],
-    arch: {
-        arm64: {
-            enabled: true,
-        },
-    },
-}
-
-cc_library_shared {
-    name: "libclang_rt.ubsan_standalone-i686-android",
-    defaults: ["libclang_rt_ubsan_defaults"],
-    arch: {
-        x86: {
-            enabled: true,
-        },
-    },
-}
-
-cc_library_shared {
-    name: "libclang_rt.ubsan_standalone-x86_64-android",
-    defaults: ["libclang_rt_ubsan_defaults"],
-    arch: {
-        x86_64: {
-            enabled: true,
-        },
-    },
-}
-
-cc_library_shared {
-    name: "libclang_rt.ubsan_standalone-mips-android",
-    defaults: ["libclang_rt_ubsan_defaults"],
-    arch: {
-        mips: {
-            enabled: true,
-        },
-    },
-}
-
-cc_library_shared {
-    name: "libclang_rt.ubsan_standalone-mips64-android",
-    defaults: ["libclang_rt_ubsan_defaults"],
-    arch: {
-        mips64: {
-            enabled: true,
-        },
-    },
-}
+// Disable libubsan_standalone prebuilts in aosp/master until soong has a build
+// option to pick a prebuilt or compile/build a module.
+//
+// cc_library_shared {
+//     name: "libclang_rt.ubsan_standalone-arm-android",
+//     defaults: ["libclang_rt_ubsan_defaults"],
+//     arch: {
+//         arm: {
+//             enabled: true,
+//         },
+//     },
+// }
+//
+// cc_library_shared {
+//     name: "libclang_rt.ubsan_standalone-aarch64-android",
+//     defaults: ["libclang_rt_ubsan_defaults"],
+//     arch: {
+//         arm64: {
+//             enabled: true,
+//         },
+//     },
+// }
+//
+// cc_library_shared {
+//     name: "libclang_rt.ubsan_standalone-i686-android",
+//     defaults: ["libclang_rt_ubsan_defaults"],
+//     arch: {
+//         x86: {
+//             enabled: true,
+//         },
+//     },
+// }
+//
+// cc_library_shared {
+//     name: "libclang_rt.ubsan_standalone-x86_64-android",
+//     defaults: ["libclang_rt_ubsan_defaults"],
+//     arch: {
+//         x86_64: {
+//             enabled: true,
+//         },
+//     },
+// }
+//
+// cc_library_shared {
+//     name: "libclang_rt.ubsan_standalone-mips-android",
+//     defaults: ["libclang_rt_ubsan_defaults"],
+//     arch: {
+//         mips: {
+//             enabled: true,
+//         },
+//     },
+// }
+//
+// cc_library_shared {
+//     name: "libclang_rt.ubsan_standalone-mips64-android",
+//     defaults: ["libclang_rt_ubsan_defaults"],
+//     arch: {
+//         mips64: {
+//             enabled: true,
+//         },
+//     },
+// }
 
 //###############################################################################
 // Host modules