diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index 3620494ddde6a..0a8d1f30e9979 100644
--- a/media/jni/Android.mk
+++ b/media/jni/Android.mk
@@ -11,15 +11,16 @@ LOCAL_SRC_FILES:= \
 	android_media_ResampleInputStream.cpp
 
 LOCAL_SHARED_LIBRARIES := \
-	libopencoreplayer \
-	libopencoreauthor \
+	libopencore_player \
+	libopencore_author \
 	libandroid_runtime \
 	libnativehelper \
 	libcutils \
 	libutils \
 	libmedia \
 	libsgl \
-	libui
+	libui \
+	libomx_amrenc_sharedlibrary
 
 LOCAL_STATIC_LIBRARIES :=
 
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 f7109210d8503..922df43de57a6 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -22,8 +22,8 @@ LOCAL_SHARED_LIBRARIES := \
 	libutils \
 	libvorbisidec \
 	libsonivox \
-	libopencoreplayer \
-	libopencoreauthor \
+	libopencore_player \
+	libopencore_author \
 	libmedia \
 	libandroid_runtime