Snap for 4496165 from 5151af823c9c03bedd30b41caaa01e53e3324c76 to pi-release

Change-Id: I1764100fb8e0461783507b339c6bdf652516d515
diff --git a/tests/Android.mk b/tests/Android.mk
index 7a288ac..f35756f 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,7 +18,7 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_PACKAGE_NAME := CalendarCommonTests
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
+LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit
 
 include $(BUILD_PACKAGE)