Snap for 4620899 from 1f38803dbc74330cc46050eb7a6763b811219576 to pi-release

Change-Id: I189c8459593547574dd60837b55dbba21ad3a4a8
diff --git a/Android.mk b/Android.mk
index be94d89..b85a651 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
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
diff --git a/tests/Android.mk b/tests/Android.mk
index 020aad8..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 android.test.base
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
 LOCAL_STATIC_JAVA_LIBRARIES := junit
 
 LOCAL_INSTRUMENTATION_FOR := PartnerBookmarksProvider