diff --git a/libwvdrmengine/test/java/Android.mk b/libwvdrmengine/test/java/Android.mk
index b8d5e7fe..4fed10e3 100644
--- a/libwvdrmengine/test/java/Android.mk
+++ b/libwvdrmengine/test/java/Android.mk
@@ -7,8 +7,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := MediaDrmAPITest
 
-# TODO: Uncomment this line when the MediaDrm APIs are unhidden
-#LOCAL_SDK_VERSION := current
+LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
+
+# TODO: This test app depends on framework implementation details.
+# LOCAL_SDK_VERSION := current
 
 include $(BUILD_PACKAGE)
 
diff --git a/libwvdrmengine/test/java/AndroidManifest.xml b/libwvdrmengine/test/java/AndroidManifest.xml
index 9d27677e..eff32480 100644
--- a/libwvdrmengine/test/java/AndroidManifest.xml
+++ b/libwvdrmengine/test/java/AndroidManifest.xml
@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
-    <uses-sdk android:minSdkVersion="12"></uses-sdk>
+    <uses-sdk android:minSdkVersion="12" />
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar">
         <activity android:name="MediaDrmAPITest"
                   android:label="@string/app_name"
diff --git a/proprietary/samplePlayer/Android.mk b/proprietary/samplePlayer/Android.mk
index 36b9ad8a..42a53485 100644
--- a/proprietary/samplePlayer/Android.mk
+++ b/proprietary/samplePlayer/Android.mk
@@ -7,6 +7,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := WidevineSamplePlayer
 
+LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
+
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_PACKAGE)
diff --git a/proprietary/samplePlayer/AndroidManifest.xml b/proprietary/samplePlayer/AndroidManifest.xml
index 63dd11bd..283e5639 100644
--- a/proprietary/samplePlayer/AndroidManifest.xml
+++ b/proprietary/samplePlayer/AndroidManifest.xml
@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
-    <uses-sdk android:minSdkVersion="12"></uses-sdk>
+    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="12" />
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar">
         <activity android:name=".WidevineSamplePlayer"
                   android:label="@string/app_name"