Snap for 10453563 from fb1f9e9ccd2c2ae32326c74346cb33d7f925190a to mainline-art-release

Change-Id: I05620ea3b3dd60d8654ba0f493ed9d52b2fe31dd
diff --git a/Android.bp b/Android.bp
index fa02f9d..716f9ae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -79,10 +79,19 @@
     errorprone: {
         javacflags: [
             "-Xep:CollectionIncompatibleType:WARN",  // b/74213384
+            "-Xep:BoxedPrimitiveEquality:WARN",
         ],
     }
 }
 
+// Compatibility library for Maven artifact naming scheme
+java_library_static {
+    name: "mockito-core",
+    hostdex: true,
+    static_libs: ["mockito"],
+    sdk_version: "core_current",
+}
+
 // Compatibility library for old name of host target
 java_library_host {
     name: "mockito-host",