Add Mockito to deps for Conscrypt tests and remove core-tests

Mockito needs to be added to the deps for Conscrypt tests in preparation
to add tests that require Mockito.

Additionally remove core-tests from the list of static libraries.
Libcore CTS tests were originally split up because the dex limit is too
big in the first place and adding Mockito pushes it over the limit.

Verified removing core-tests still runs the tests and no tests change
pass/fail status.

Test: make -j32 cts && cts-tradefed run cts -d -p android.core.tests.libcore.package.conscrypt
Bug: 30751283
Change-Id: I2e6173b4d3b41d80e55fb36ca4679f5713a9c53d
diff --git a/tests/core/libcore/conscrypt/Android.mk b/tests/core/libcore/conscrypt/Android.mk
index cd8559c..55beb9d 100644
--- a/tests/core/libcore/conscrypt/Android.mk
+++ b/tests/core/libcore/conscrypt/Android.mk
@@ -20,6 +20,6 @@
 
 include $(CLEAR_VARS)
 LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.conscrypt
-LOCAL_STATIC_JAVA_LIBRARIES := core-tests conscrypt-tests
+LOCAL_STATIC_JAVA_LIBRARIES := conscrypt-tests mockito-target-minus-junit4
 LOCAL_JAVA_LANGUAGE_VERSION := 1.8
 include $(BUILD_CTSCORE_PACKAGE)