Merge "Mockito: Downgrade Errorprone warning"
diff --git a/Android.bp b/Android.bp
index 03d57ee..851bc81 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,6 +50,12 @@
     },
     sdk_version: "16",
     java_version: "1.7",
+
+    errorprone: {
+        javacflags: [
+            "-Xep:CollectionIncompatibleType:WARN",  // b/74213384
+        ],
+    }
 }
 
 // Compatibility library for old name of host target