diff --git a/src/common/android/include/link.h b/src/common/android/include/link.h
index e7ff8e2d..58180a8e 100644
--- a/src/common/android/include/link.h
+++ b/src/common/android/include/link.h
@@ -30,10 +30,18 @@
 #ifndef GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H
 #define GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H
 
-/* Android doesn't provide all the data-structures required in its <link.h>.
-   Provide custom version here. */
+// Android doesn't provide all the data-structures required in
+// its <link.h> before release 21. Provide custom version here and
+// rename Bionic-provided structures to avoid conflicts.
+
+#define r_debug   __bionic_r_debug
+#define link_map  __bionic_link_map
+
 #include_next <link.h>
 
+#undef r_debug
+#undef link_map
+
 // TODO(rmcilroy): Remove this file once the ndk is updated for other
 // architectures - crbug.com/358831
 #if !defined(__aarch64__) && !defined(__x86_64__) && \