Merge "Fix regoff_t for LP32 and _FILE_OFFSET_BITS=64."
diff --git a/libc/Android.mk b/libc/Android.mk
index 437f8b2..d6b208c 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1446,6 +1446,7 @@
 # Only need this for arm since libc++ uses its own unwind code that
 # doesn't mix with the other default unwind code.
 LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm
+LOCAL_LDFLAGS_arm := -Wl,--exclude-libs,libunwind_llvm.a
 LOCAL_STATIC_LIBRARIES += libc++abi
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true