Merge "Stop statically including legacy-android-test"

tests/unit/Android.mk

@@ -5,14 +5,19 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := tests
 LOCAL_CERTIFICATE := platform
 
-LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common ims-common
+LOCAL_JAVA_LIBRARIES := \
+    android.test.runner \
+    telephony-common \
+    ims-common \
+    android.test.base \
+    android.test.mock \
+
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
     espresso-core \
     espresso-contrib-nodep \
     espresso-intents-nodep \
-    legacy-android-test \
     mockito-target-minus-junit4 \
     platform-test-annotations \
     truth-prebuilt \