diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index faa1e0f..7b84fe7 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,7 +24,7 @@
 
     <original-package android:name="com.android.gallery3d" />
 
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28"/>
 
     <permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
                 android:protectionLevel="signatureOrSystem" />
diff --git a/gallerycommon/Android.mk b/gallerycommon/Android.mk
index 97b6faf..735227f 100644
--- a/gallerycommon/Android.mk
+++ b/gallerycommon/Android.mk
@@ -22,6 +22,9 @@
 
 LOCAL_MODULE := org.codeaurora.gallery.common
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SDK_VERSION := 16
+
+LOCAL_PRIVATE_PLATFORM_APIS := true
+
+LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
 
 include $(BUILD_STATIC_JAVA_LIBRARY)