reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
diff --git a/Android.mk b/Android.mk
index 9e3a0a0..3a0e54b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,9 @@
 	Tremolo/mdctARM.s
 LOCAL_CFLAGS += \
     -D_ARM_ASSEM_
+# Assembly code in asm_arm.h does not compile with Clang.
+LOCAL_CLANG_ASFLAGS += \
+    -no-integrated-as
 else
 LOCAL_CFLAGS += \
     -DONLY_C