diff --git a/Android.mk b/Android.mk
index 89e09ea094fe1f6faa6ce2d4b75f3ee711bf37e4..ead77985486ae4ca45da7c9d22efc6666bfddfab 100755
--- a/Android.mk
+++ b/Android.mk
@@ -26,6 +26,7 @@ LOCAL_AAPT_FLAGS := \
         --version-code $(version_code_package) \
 
 LOCAL_PACKAGE_NAME := SnapdragonCamera
+LOCAL_PRODUCT_MODULE := true
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_PRIVATE_PLATFORM_APIS:=true
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ef5d886f4396385703146509ff96bdd2a5a8556f..736b3721b966419df08e679d7701b2f9fd75185e 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,10 +20,8 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
     <supports-screens
diff --git a/jni/Android.mk b/jni/Android.mk
index de2abb6b869370e25b36cea8d64f4273a375075e..ad700101580ac27326a051ff5d6b8b9f9b02bcc8 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -46,6 +46,8 @@ LOCAL_LDFLAGS := -llog -lGLESv2
 
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_PRODUCT_MODULE := true
+
 LOCAL_MODULE    := libjni_snapcammosaic
 include $(BUILD_SHARED_LIBRARY)
 
@@ -55,6 +57,7 @@ include $(CLEAR_VARS)
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_LDFLAGS   := -llog -ljnigraphics
 LOCAL_SDK_VERSION := 9
+LOCAL_PRODUCT_MODULE := true
 LOCAL_MODULE    := libjni_snapcamtinyplanet
 LOCAL_SRC_FILES := tinyplanet.cc
 
@@ -67,6 +70,7 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_LDFLAGS   := -llog
 LOCAL_SDK_VERSION := 9
+LOCAL_PRODUCT_MODULE := true
 LOCAL_MODULE    := libjni_imageutil
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := image_util_jni.cpp