diff --git a/linker/Android.bp b/linker/Android.bp
index 2fcf369..7877a37 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -271,12 +271,7 @@
     name: "ld-android",
     defaults: ["linux_bionic_supported"],
 
-    // NOTE: ld-android.so needs __aeabi_unwind_cpp_pr0 from libgcc.a but libgcc.a
-    // needs a few symbols from libc. Using --no-undefined here results in having to
-    // link against libc creating a circular dependency which is removed and we end
-    // up with missing symbols. Since this library is just a bunch of stubs, we set
-    // allow_undefined_symbols to remove --no-undefined from the linker flags.
-    allow_undefined_symbols: true,
+    nocrt: true,
     system_shared_libs: [],
 
     sanitize: {
diff --git a/linker/ld_android.cpp b/linker/ld_android.cpp
index e2499b3..0528cd8 100644
--- a/linker/ld_android.cpp
+++ b/linker/ld_android.cpp
@@ -26,11 +26,10 @@
  * SUCH DAMAGE.
  */
 
-#include <stdlib.h>
 #include <sys/cdefs.h>
 
 extern "C" void __internal_linker_error() {
-  abort();
+  __builtin_trap();
 }
 
 __strong_alias(__loader_android_create_namespace, __internal_linker_error);
@@ -59,3 +58,14 @@
 #endif
 __strong_alias(rtld_db_dlactivity, __internal_linker_error);
 
+#if defined(__arm__)
+// An arm32 unwinding table has an R_ARM_NONE relocation to
+// __aeabi_unwind_cpp_pr0. This shared library will never invoke the unwinder,
+// so it doesn't actually need the routine. Define a dummy version here,
+// because the real version calls libc functions (e.g. memcpy, abort), which
+// would create a dependency cycle with libc.so.
+__attribute__((visibility("hidden")))
+extern "C" void __aeabi_unwind_cpp_pr0() {
+  __builtin_trap();
+}
+#endif