diff --git a/Android.mk b/Android.mk
index f899fe0..a3cc6fa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,7 +48,12 @@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES)
 
+ifeq ($(TARGET_ARCH),x86)
+# Temporarily build without clang, until b/25435766 fixes core2md segfault.
+LOCAL_CLANG := false
+else
 LOCAL_CLANG := true
+endif
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -64,7 +69,12 @@
 
 LOCAL_STATIC_LIBRARIES := breakpad_client
 
+ifeq ($(TARGET_ARCH),x86)
+# Temporarily build without clang, until b/25435766 fixes core2md segfault.
+LOCAL_CLANG := false
+else
 LOCAL_CLANG := true
+endif
 
 include $(BUILD_EXECUTABLE)