Snap for 4623514 from c0246198be80c6a8185aba01707e3c6ecba21222 to pi-release

Change-Id: I6d1ed97ab6528f3f2060abf231c6a0feb06e4120
diff --git a/tests/Android.mk b/tests/Android.mk
index f35756f..d766463 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -17,8 +17,9 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_PACKAGE_NAME := CalendarCommonTests
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
 LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit
 
 include $(BUILD_PACKAGE)