Snap for 4496165 from 767b5ed83efe6bd7eed25e4ef2252c7367f59d60 to pi-release

Change-Id: I0d71ae4d320c80c3a65dbb301c24934b6e75f70c
diff --git a/tests/Android.mk b/tests/Android.mk
index fe6aa71..e5a4480 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -3,8 +3,8 @@
 
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
+LOCAL_STATIC_JAVA_LIBRARIES := junit
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)