diff --git a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
index cd6d2c2..2d6346f 100644
--- a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
+++ b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
@@ -1463,7 +1463,7 @@
     BacktraceUnwindFake(
       std::vector<unwindstack::LocalFrameData>{{nullptr, 0x1100, 0x100, "fake1", 10},
                                                {nullptr, 0x1200, 0x200, "fake2", 20}});
-    unwindstack::MapInfo map_info{0x10000, 0x20000, 0, PROT_READ | PROT_EXEC, "/data/fake.so"};
+    unwindstack::MapInfo map_info{nullptr, 0x10000, 0x20000, 0, PROT_READ | PROT_EXEC, "/data/fake.so"};
     BacktraceUnwindFake(
       std::vector<unwindstack::LocalFrameData>{{&map_info, 0x1a000, 0xa000, "level1", 0},
                                                {&map_info, 0x1b000, 0xb000, "level2", 10}});
diff --git a/libdl/Android.bp b/libdl/Android.bp
index d5f8e70..0efde34 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -43,7 +43,13 @@
     //
     // DO NOT REMOVE --exclude-libs!
 
-    ldflags: ["-Wl,--exclude-libs=libgcc.a"],
+    ldflags: [
+        "-Wl,--exclude-libs=libgcc.a",
+        "-Wl,--exclude-libs=libclang_rt.builtins-arm-android.a",
+        "-Wl,--exclude-libs=libclang_rt.builtins-aarch64-android.a",
+        "-Wl,--exclude-libs=libclang_rt.builtins-x86-android.a",
+        "-Wl,--exclude-libs=libclang_rt.builtins-x86_64-android.a",
+    ],
 
     // for x86, exclude libgcc_eh.a for the same reasons as above
     arch: {
diff --git a/linker/Android.bp b/linker/Android.bp
index 1e14ee3..697c260 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -305,7 +305,13 @@
     //
     // DO NOT REMOVE --exclude-libs!
 
-    ldflags: ["-Wl,--exclude-libs=libgcc.a"],
+    ldflags: [
+        "-Wl,--exclude-libs=libgcc.a",
+        "-Wl,--exclude-libs=libclang_rt.builtins-arm-android.a",
+        "-Wl,--exclude-libs=libclang_rt.builtins-aarch64-android.a",
+        "-Wl,--exclude-libs=libclang_rt.builtins-x86-android.a",
+        "-Wl,--exclude-libs=libclang_rt.builtins-x86_64-android.a",
+    ],
 
     // for x86, exclude libgcc_eh.a for the same reasons as above
     arch: {