Use mockito-target-minus-junit4.

mockito-api isn't sufficient for tests that actually use mockito.

bug: 26458139
bug: 29411540

(cherry picked from commit 16ce308a1f34e4071f76a395ad105597209f56e8)

Change-Id: If7d511fd6bfbc51a6f1928b04b269a36151b3fb9
diff --git a/tests/core/libcore/libcore/ b/tests/core/libcore/libcore/
index ec6228b..c9aea5e 100644
--- a/tests/core/libcore/libcore/
+++ b/tests/core/libcore/libcore/
@@ -16,6 +16,9 @@
 include $(CLEAR_VARS)
 LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.libcore
-LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-api
+# Note that we're not pulling in junit4 here because it's provided by
+# android.test.runner (which might pull in a different version from the
+# one that would be pulled in here).
+LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-target-minus-junit4