Android: Update error 2.3.1 -> 2.3.3

This fixes compatibility with JDK 11.
use_errorprone_java_compiler GN arg cannot be re-enabled until newly
added checks are either fixed or silenced.

Bug: 894616, 1027541
Change-Id: Ic3727188867623b05228c58157818b500a886194
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1933767Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718685}

DEPS

@@ -3012,7 +3012,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation',
-              'version': 'version:2.3.1-cr0',
+              'version': 'version:2.3.3-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3023,7 +3023,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations',
-              'version': 'version:2.3.1-cr0',
+              'version': 'version:2.3.3-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3034,7 +3034,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api',
-              'version': 'version:2.3.1-cr0',
+              'version': 'version:2.3.3-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3045,7 +3045,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core',
-              'version': 'version:2.3.1-cr0',
+              'version': 'version:2.3.3-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3056,7 +3056,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations',
-              'version': 'version:2.3.1-cr0',
+              'version': 'version:2.3.3-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3140,6 +3140,17 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  'src/third_party/android_deps/libs/com_google_protobuf_protobuf_java': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_java',
+              'version': 'version:3.4.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
   'src/third_party/android_deps/libs/com_google_protobuf_protobuf_lite': {
       'packages': [
           {
@@ -3221,7 +3232,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual',
-              'version': 'version:2.5.2-cr0',
+              'version': 'version:2.5.3-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3232,7 +3243,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow',
-              'version': 'version:2.5.0-cr0',
+              'version': 'version:2.5.3-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3243,7 +3254,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_checkerframework_javacutil',
-              'version': 'version:2.5.0-cr0',
+              'version': 'version:2.5.3-cr0',
           },
       ],
       'condition': 'checkout_android',

third_party/android_deps/BUILD.gn

@@ -1104,7 +1104,7 @@ java_prebuilt("com_google_dagger_dagger_compiler_java") {
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_errorprone_error_prone_core_java") {
   jar_path =
-      "libs/com_google_errorprone_error_prone_core/error_prone_core-2.3.1.jar"
+      "libs/com_google_errorprone_error_prone_core/error_prone_core-2.3.3.jar"
   output_name = "com_google_errorprone_error_prone_core"
   enable_bytecode_rewriter = false
   deps = [
@@ -1118,6 +1118,7 @@ java_prebuilt("com_google_errorprone_error_prone_core_java") {
     ":com_google_errorprone_error_prone_type_annotations_java",
     ":com_google_errorprone_javac_java",
     ":com_google_guava_guava_java",
+    ":com_google_protobuf_protobuf_java_java",
     ":org_checkerframework_dataflow_java",
     ":org_pcollections_pcollections_java",
   ]
@@ -1876,7 +1877,7 @@ java_prebuilt("com_google_dagger_dagger_spi_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_errorprone_error_prone_annotation_java") {
-  jar_path = "libs/com_google_errorprone_error_prone_annotation/error_prone_annotation-2.3.1.jar"
+  jar_path = "libs/com_google_errorprone_error_prone_annotation/error_prone_annotation-2.3.3.jar"
   output_name = "com_google_errorprone_error_prone_annotation"
   enable_bytecode_rewriter = false
 
@@ -1890,7 +1891,7 @@ java_prebuilt("com_google_errorprone_error_prone_annotation_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_errorprone_error_prone_annotations_java") {
-  jar_path = "libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.3.1.jar"
+  jar_path = "libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.3.3.jar"
   output_name = "com_google_errorprone_error_prone_annotations"
   enable_bytecode_rewriter = false
 
@@ -1901,7 +1902,7 @@ java_prebuilt("com_google_errorprone_error_prone_annotations_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_errorprone_error_prone_check_api_java") {
-  jar_path = "libs/com_google_errorprone_error_prone_check_api/error_prone_check_api-2.3.1.jar"
+  jar_path = "libs/com_google_errorprone_error_prone_check_api/error_prone_check_api-2.3.3.jar"
   output_name = "com_google_errorprone_error_prone_check_api"
   enable_bytecode_rewriter = false
 
@@ -1921,7 +1922,7 @@ java_prebuilt("com_google_errorprone_error_prone_check_api_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_errorprone_error_prone_type_annotations_java") {
-  jar_path = "libs/com_google_errorprone_error_prone_type_annotations/error_prone_type_annotations-2.3.1.jar"
+  jar_path = "libs/com_google_errorprone_error_prone_type_annotations/error_prone_type_annotations-2.3.3.jar"
   output_name = "com_google_errorprone_error_prone_type_annotations"
   enable_bytecode_rewriter = false
 
@@ -1991,6 +1992,17 @@ java_prebuilt("com_google_j2objc_j2objc_annotations_java") {
   visibility = [ ":*" ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+java_prebuilt("com_google_protobuf_protobuf_java_java") {
+  jar_path = "libs/com_google_protobuf_protobuf_java/protobuf-java-3.4.0.jar"
+  output_name = "com_google_protobuf_protobuf_java"
+  enable_bytecode_rewriter = false
+
+  # To remove visibility constraint, add this dependency to
+  # //tools/android/roll/android_deps/build.gradle.
+  visibility = [ ":*" ]
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_googlecode_java_diff_utils_diffutils_java") {
   jar_path = "libs/com_googlecode_java_diff_utils_diffutils/diffutils-1.3.0.jar"
@@ -2030,7 +2042,7 @@ java_prebuilt("org_checkerframework_checker_compat_qual_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_checkerframework_checker_qual_java") {
-  jar_path = "libs/org_checkerframework_checker_qual/checker-qual-2.5.2.jar"
+  jar_path = "libs/org_checkerframework_checker_qual/checker-qual-2.5.3.jar"
   output_name = "org_checkerframework_checker_qual"
   enable_bytecode_rewriter = false
 
@@ -2041,7 +2053,7 @@ java_prebuilt("org_checkerframework_checker_qual_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_checkerframework_dataflow_java") {
-  jar_path = "libs/org_checkerframework_dataflow/dataflow-2.5.0.jar"
+  jar_path = "libs/org_checkerframework_dataflow/dataflow-2.5.3.jar"
   output_name = "org_checkerframework_dataflow"
   enable_bytecode_rewriter = false
 
@@ -2056,7 +2068,7 @@ java_prebuilt("org_checkerframework_dataflow_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_checkerframework_javacutil_java") {
-  jar_path = "libs/org_checkerframework_javacutil/javacutil-2.5.0.jar"
+  jar_path = "libs/org_checkerframework_javacutil/javacutil-2.5.3.jar"
   output_name = "org_checkerframework_javacutil"
   enable_bytecode_rewriter = false
 

third_party/android_deps/additional_readme_paths.json

@@ -141,6 +141,7 @@
     "libs/com_google_guava_guava",
     "libs/com_google_guava_listenablefuture",
     "libs/com_google_j2objc_j2objc_annotations",
+    "libs/com_google_protobuf_protobuf_java",
     "libs/com_google_protobuf_protobuf_lite",
     "libs/com_googlecode_java_diff_utils_diffutils",
     "libs/com_squareup_javapoet",

third_party/android_deps/libs/com_google_errorprone_error_prone_annotation/README.chromium

 Name: @BugPattern annotation
 Short Name: error_prone_annotation
 URL: 
-Version: 2.3.1
+Version: 2.3.3
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_errorprone_error_prone_annotation/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.3.1-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.3.3-cr0
 package: chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation
 description: "@BugPattern annotation"
 data:
-- file: error_prone_annotation-2.3.1.jar
+- file: error_prone_annotation-2.3.3.jar

third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/README.chromium

 Name: error-prone annotations
 Short Name: error_prone_annotations
 URL: https://errorprone.info/
-Version: 2.3.1
+Version: 2.3.3
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.3.1-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.3.3-cr0
 package: chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations
 description: "error-prone annotations"
 data:
-- file: error_prone_annotations-2.3.1.jar
+- file: error_prone_annotations-2.3.3.jar

third_party/android_deps/libs/com_google_errorprone_error_prone_check_api/README.chromium

 Name: error-prone check api
 Short Name: error_prone_check_api
 URL: 
-Version: 2.3.1
+Version: 2.3.3
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_errorprone_error_prone_check_api/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.3.1-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.3.3-cr0
 package: chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api
 description: "error-prone check api"
 data:
-- file: error_prone_check_api-2.3.1.jar
+- file: error_prone_check_api-2.3.3.jar

third_party/android_deps/libs/com_google_errorprone_error_prone_core/README.chromium

 Name: error-prone library
 Short Name: error_prone_core
 URL: 
-Version: 2.3.1
+Version: 2.3.3
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_errorprone_error_prone_core/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.3.1-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.3.3-cr0
 package: chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core
 description: "error-prone library"
 data:
-- file: error_prone_core-2.3.1.jar
+- file: error_prone_core-2.3.3.jar

third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations/README.chromium

 Name: error-prone type annotations
 Short Name: error_prone_type_annotations
 URL: 
-Version: 2.3.1
+Version: 2.3.3
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.3.1-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.3.3-cr0
 package: chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations
 description: "error-prone type annotations"
 data:
-- file: error_prone_type_annotations-2.3.1.jar
+- file: error_prone_type_annotations-2.3.3.jar

third_party/android_deps/libs/com_google_protobuf_protobuf_java/LICENSE

+Copyright 2008 Google Inc.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it.  This code is not
+standalone and requires a support library to be linked with it.  This
+support library is itself covered by the above license.

third_party/android_deps/libs/com_google_protobuf_protobuf_java/OWNERS

+file://third_party/android_deps/OWNERS
\ No newline at end of file

third_party/android_deps/libs/com_google_protobuf_protobuf_java/README.chromium

+Name: Protocol Buffers [Core]
+Short Name: protobuf-java
+URL: https://github.com/protocolbuffers/protobuf/blob/master/java/lite.md
+Version: 3.4.0
+License: BSD
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+Core Protocol Buffers library. Protocol Buffers are a way of encoding structured data in an efficient yet extensible format.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_protobuf_protobuf_java/cipd.yaml

+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:3.4.0-cr0
+package: chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_java
+description: "Protocol Buffers [Core]"
+data:
+- file: protobuf-java-3.4.0.jar

third_party/android_deps/libs/org_checkerframework_checker_qual/README.chromium

 Name: Checker Qual
 Short Name: checker-qual
 URL: https://checkerframework.org
-Version: 2.5.2
+Version: 2.5.3
 License: GPL v2 with the classpath exception
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/org_checkerframework_checker_qual/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.5.2-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.5.3-cr0
 package: chromium/third_party/android_deps/libs/org_checkerframework_checker_qual
 description: "Checker Qual"
 data:
-- file: checker-qual-2.5.2.jar
+- file: checker-qual-2.5.3.jar

third_party/android_deps/libs/org_checkerframework_dataflow/README.chromium

 Name: Dataflow
 Short Name: dataflow
 URL: https://checkerframework.org
-Version: 2.5.0
+Version: 2.5.3
 License: GPL v2 with the classpath exception
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/org_checkerframework_dataflow/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.5.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.5.3-cr0
 package: chromium/third_party/android_deps/libs/org_checkerframework_dataflow
 description: "Dataflow"
 data:
-- file: dataflow-2.5.0.jar
+- file: dataflow-2.5.3.jar

third_party/android_deps/libs/org_checkerframework_javacutil/README.chromium

 Name: Javacutil
 Short Name: javacutil
 URL: https://checkerframework.org
-Version: 2.5.0
+Version: 2.5.3
 License: GPL v2 with the classpath exception
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/org_checkerframework_javacutil/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.5.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.5.3-cr0
 package: chromium/third_party/android_deps/libs/org_checkerframework_javacutil
 description: "Javacutil"
 data:
-- file: javacutil-2.5.0.jar
+- file: javacutil-2.5.3.jar

tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/AndroidNullableCheck.java

@@ -17,7 +17,7 @@ import com.sun.source.tree.AnnotationTree;
  * Assert android.support.annotation.Nullable is used instead of javax.annotation.Nullable.
  */
 @AutoService(BugChecker.class)
-@BugPattern(name = "AndroidNullableCheck", category = BugPattern.Category.ANDROID,
+@BugPattern(name = "AndroidNullableCheck",
         summary = "Use android.support.annotation.Nullable instead of javax.annotation.Nullable.",
         severity = BugPattern.SeverityLevel.ERROR, linkType = BugPattern.LinkType.CUSTOM,
         link = "http://crbug.com/771683")

tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoAndroidAsyncTaskCheck.java

@@ -17,7 +17,7 @@ import com.sun.tools.javac.code.Symbol;
  * Triggers an error for any occurrence of android.os.AsyncTask.
  */
 @AutoService(BugChecker.class)
-@BugPattern(name = "NoAndroidAsyncTaskCheck", category = BugPattern.Category.ANDROID,
+@BugPattern(name = "NoAndroidAsyncTaskCheck",
         summary = "Do not use android.os.AsyncTask - use org.chromium.base.task.AsyncTask instead",
         severity = BugPattern.SeverityLevel.ERROR, linkType = BugPattern.LinkType.CUSTOM,
         link = "https://bugs.chromium.org/p/chromium/issues/detail?id=843745")

tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoDynamicStringsInTraceEventCheck.java

@@ -30,7 +30,7 @@ import javax.lang.model.element.Modifier;
  * Triggers an error for {@link org.chromium.base.TraceEvent} usages with non string literals.
  */
 @AutoService(BugChecker.class)
-@BugPattern(name = "NoDynamicStringsInTraceEventCheck", category = BugPattern.Category.JDK,
+@BugPattern(name = "NoDynamicStringsInTraceEventCheck",
         summary = "Only use of string literals are allowed in trace events.",
         severity = BugPattern.SeverityLevel.ERROR, linkType = BugPattern.LinkType.CUSTOM,
         link = "https://crbug.com/984827")

tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoRedundantFieldInitCheck.java

@@ -27,7 +27,7 @@ import javax.lang.model.element.Modifier;
  * Detects when non-final fields are explicitly initialized to default values
  */
 @AutoService(BugChecker.class)
-@BugPattern(name = "NoRedundantFieldInit", category = BugPattern.Category.ANDROID,
+@BugPattern(name = "NoRedundantFieldInit",
         summary = "Do not explicitly initialize a non-final field with a default value",
         severity = BugPattern.SeverityLevel.ERROR, linkType = BugPattern.LinkType.CUSTOM,
         link = "https://issuetracker.google.com/issues/37124982")

tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoSynchronizedMethodCheck.java

@@ -20,7 +20,7 @@ import javax.lang.model.element.Modifier;
  * Triggers an error for public methods that use "synchronized" in their signature.
  */
 @AutoService(BugChecker.class)
-@BugPattern(name = "NoSynchronizedMethodCheck", category = BugPattern.Category.JDK,
+@BugPattern(name = "NoSynchronizedMethodCheck",
         summary = "Use of synchronized in public method signature disallowed.",
         severity = BugPattern.SeverityLevel.ERROR, linkType = BugPattern.LinkType.CUSTOM,
         link = "https://stackoverflow.com/questions/20906548/why-is-synchronized-block-better-than-synchronized-method")

tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoSynchronizedThisCheck.java

@@ -21,7 +21,7 @@ import javax.lang.model.element.Modifier;
  * This class detects the synchronized method.
  */
 @AutoService(BugChecker.class)
-@BugPattern(name = "NoSynchronizedThisCheck", category = BugPattern.Category.JDK,
+@BugPattern(name = "NoSynchronizedThisCheck",
         summary = "Do not synchronized on 'this' in public classes",
         severity = BugPattern.SeverityLevel.ERROR, linkType = BugPattern.LinkType.CUSTOM,
         link = "https://stackoverflow.com/questions/442564/avoid-synchronizedthis-in-java")

tools/android/roll/android_deps/build.gradle

@@ -134,7 +134,7 @@ dependencies {
     buildCompile "com.google.auto.service:auto-service-annotations:1.0-rc6"
     buildCompile "com.google.auto.service:auto-service:1.0-rc6"
 
-    buildCompile "com.google.errorprone:error_prone_core:2.3.1"
+    buildCompile "com.google.errorprone:error_prone_core:2.3.3"
 
     // testCompile targets have test_only = true.
     testCompile "androidx.test:core:1.0.0"

tools/android/roll/android_deps/buildSrc/src/main/groovy/ChromiumDepGraph.groovy

@@ -62,6 +62,10 @@ class ChromiumDepGraph {
             licenseUrl: "https://raw.githubusercontent.com/mojohaus/animal-sniffer/master/animal-sniffer-annotations/pom.xml",
             licensePath: "licenses/Codehaus_License-2009.txt",
             licenseName: "MIT"),
+        'com_google_protobuf_protobuf_java': new PropertyOverride(
+            url: "https://github.com/protocolbuffers/protobuf/blob/master/java/lite.md",
+            licenseUrl: "https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE",
+            licenseName: "BSD"),
         'com_google_protobuf_protobuf_lite': new PropertyOverride(
             url: "https://github.com/protocolbuffers/protobuf/blob/master/java/lite.md",
             licenseUrl: "https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE",