Merge f633b65c640cd5eceaf7a8e302531106b7ca49c9 on remote branch

Change-Id: Ic8381956ad336cd315d98270abd17374665c3bbc
diff --git a/Android.bp b/Android.bp
index 64ae8cd..729f80a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,4 +41,7 @@
         "jackson-annotations",
         "jackson-core",
     ],
+    errorprone: {
+        javacflags: ["-Xep:EqualsNull:WARN"]
+    }
 }