diff --git a/Android.mk b/Android.mk
index 6978cfa..100cfcb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,6 +23,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := PartnerBookmarksProvider
+LOCAL_SDK_VERSION := current
 
 include $(BUILD_PACKAGE)
 
diff --git a/tests/Android.mk b/tests/Android.mk
index b509e96..8a107c7 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -23,8 +23,9 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := PartnerBookmarksProviderTest
+LOCAL_SDK_VERSION := current
 
-LOCAL_JAVA_LIBRARIES := ext legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
 LOCAL_STATIC_JAVA_LIBRARIES := junit
 
 LOCAL_INSTRUMENTATION_FOR := PartnerBookmarksProvider