Snap for 4496165 from da9297f09aa1a339a529c0a83990e77964de4631 to pi-release

Change-Id: Icec3b78ba20f0f9b1eecd6f39b5ed8d7d608fdc3
diff --git a/tests/Android.mk b/tests/Android.mk
index e6eb52d..22e709e 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,8 +18,8 @@
 # We only want this apk build for tests.
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.test.base
+LOCAL_STATIC_JAVA_LIBRARIES := junit
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)