diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index 98a5326ced3b7..8ee0cbdeb1e27 100644
--- a/media/jni/Android.mk
+++ b/media/jni/Android.mk
@@ -1,34 +1,34 @@
+ifneq ($(BUILD_WITHOUT_PV),true)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-ifneq ($(BUILD_WITHOUT_PV),true)
-
 LOCAL_SRC_FILES:= \
-	android_media_MediaPlayer.cpp \
-	android_media_MediaRecorder.cpp \
-	android_media_MediaScanner.cpp \
-	android_media_MediaMetadataRetriever.cpp \
-	android_media_AmrInputStream.cpp \
-	android_media_ResampleInputStream.cpp
+    android_media_MediaPlayer.cpp \
+    android_media_MediaRecorder.cpp \
+    android_media_MediaScanner.cpp \
+    android_media_MediaMetadataRetriever.cpp \
+    android_media_AmrInputStream.cpp \
+    android_media_ResampleInputStream.cpp
 
 LOCAL_SHARED_LIBRARIES := \
-	libopencoreplayer \
-	libopencoreauthor \
-	libandroid_runtime \
-	libnativehelper \
-	libcutils \
-	libutils \
-	libmedia \
-	libsgl \
-	libui
+    libopencore_player \
+    libopencore_author \
+    libomx_amrenc_sharedlibrary \
+    libandroid_runtime \
+    libnativehelper \
+    libcutils \
+    libutils \
+    libmedia \
+    libsgl \
+    libui
 
 LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_C_INCLUDES += \
-	external/tremor/Tremor \
-	$(PV_INCLUDES) \
-	$(JNI_H_INCLUDE) \
-	$(call include-path-for, corecg graphics)
+    external/tremor/Tremor \
+    $(PV_INCLUDES) \
+    $(JNI_H_INCLUDE) \
+    $(call include-path-for, corecg graphics)
 
 LOCAL_CFLAGS +=
 
@@ -38,7 +38,6 @@ LOCAL_MODULE:= libmedia_jni
 
 include $(BUILD_SHARED_LIBRARY)
 
-endif
-
 # build libsoundpool.so
 include $(LOCAL_PATH)/soundpool/Android.mk
+endif
diff --git a/media/jni/android_media_AmrInputStream.cpp b/media/jni/android_media_AmrInputStream.cpp
index 978c1100a3f42..51cb6c78735c7 100644
--- a/media/jni/android_media_AmrInputStream.cpp
+++ b/media/jni/android_media_AmrInputStream.cpp
@@ -74,7 +74,7 @@ static void android_media_AmrInputStream_GsmAmrEncoderInitialize
     encodeProps.iInNumChannels = 1;
     encodeProps.iInInterleaveMode = TEncodeProperties::EINTERLEAVE_LR;
     encodeProps.iMode = CPvGsmAmrEncoder::GSM_AMR_12_2;
-    encodeProps.iBitStreamFormatIf2 = false;
+    encodeProps.iBitStreamFormat = false;
     encodeProps.iAudioObjectType = 0;
     encodeProps.iOutSamplingRate = encodeProps.iInSamplingRate;
     encodeProps.iOutNumChannels = encodeProps.iInNumChannels;
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 047823483a2b6..f7f24903e719b 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -7,40 +7,28 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:=               \
-	MediaPlayerService.cpp \
-	MetadataRetrieverClient.cpp \
-	VorbisPlayer.cpp \
-	MidiFile.cpp
-
-ifneq ($(BUILD_WITHOUT_PV),true)
-LOCAL_SRC_FILES+=               \
-	MediaRecorderClient.cpp
-endif
+    MediaRecorderClient.cpp \
+    MediaPlayerService.cpp \
+    MetadataRetrieverClient.cpp \
+    VorbisPlayer.cpp \
+    MidiFile.cpp
 
 ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
 LOCAL_LDLIBS += -ldl -lpthread
 endif
 
 LOCAL_SHARED_LIBRARIES := \
-	libcutils \
-	libutils \
-	libvorbisidec \
-	libsonivox \
-	libmedia \
-	libandroid_runtime
-
-ifneq ($(BUILD_WITHOUT_PV),true)
-LOCAL_SHARED_LIBRARIES += \
-	libopencoreplayer \
-	libopencoreauthor
-endif
+    libcutils \
+    libutils \
+    libvorbisidec \
+    libsonivox \
+    libopencore_player \
+    libopencore_author \
+    libmedia \
+    libandroid_runtime
 
 LOCAL_C_INCLUDES := external/tremor/Tremor \
-	$(call include-path-for, graphics corecg)
-
-ifeq ($(BUILD_WITHOUT_PV),true)
-LOCAL_CFLAGS := -DNO_OPENCORE
-endif
+    $(call include-path-for, graphics corecg)
 
 LOCAL_MODULE:= libmediaplayerservice