Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index a9a0fde..cf97b23 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -59,15 +59,8 @@
 	$(JNI_H_INCLUDE)                                                \
 	$(call include-path-for, graphics corecg)                       \
 	$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
-	$(TOP)/frameworks/base/media/libstagefright/include
-
-ifeq ($(TARGET_ARCH),arm)
-    LOCAL_C_INCLUDES += \
+	$(TOP)/frameworks/base/media/libstagefright/include             \
         $(TOP)/external/tremolo/Tremolo
-else
-    LOCAL_C_INCLUDES += \
-        $(TOP)/external/tremor/Tremor
-endif
 
 LOCAL_MODULE:= libmediaplayerservice