Don't include mockito in frameworks-base-testutils

So that each test can pick if they want mockito-inline or not.

Test: m -j checkbuild
Change-Id: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
Merged-In: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d

core/tests/packagemanagertests/Android.mk

@@ -10,7 +10,8 @@ LOCAL_SRC_FILES := \
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    frameworks-base-testutils
+    frameworks-base-testutils \
+    mockito-target-minus-junit4
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 LOCAL_PACKAGE_NAME := FrameworksCorePackageManagerTests

tests/utils/testutils/Android.mk

@@ -25,9 +25,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under,java)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    legacy-android-test \
+    legacy-android-test
+
+LOCAL_JAVA_LIBRARIES := \
+    android.test.runner \
     mockito-target-minus-junit4
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
 include $(BUILD_STATIC_JAVA_LIBRARY)