Fix dependencies of packages that target earlier releases
am: 6767e05934

Change-Id: I84712a036ee5e2b2eda093f6eda614acc34c4bba
diff --git a/tests/Android.mk b/tests/Android.mk
index 12d9cbe..998c1de 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -26,8 +26,9 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    mockito-target-minus-junit4 \
-    legacy-android-test
+    mockito-target-minus-junit4
+
+LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)