Snap for 10453563 from 6d7f987710eebdcc6b7b0180f50eb65086f06dd7 to mainline-art-release

Change-Id: I26f00268957fa718842c9739b5c5520471725a7e
diff --git a/Android.bp b/Android.bp
index 1a99ff3..bfdb3ec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,7 +30,14 @@
     ],
     sdk_version: "9",
     errorprone: {
-        javacflags: ["-Xep:MissingOverride:OFF"],
+        javacflags: [
+            "-Xep:MissingOverride:OFF",
+            "-Xep:ComparableType:WARN",
+            "-Xep:ReturnValueIgnored:WARN",
+        ],
+    },
+    lint: {
+        warning_checks: ["SuspiciousIndentation"],
     },
     host_supported: true,
 }