Update errorprone to 2.0.5 and make it work with jdk7 and 8.

third_party/errorprone/errorprone.gyp

Index: third_party/errorprone/errorprone.gyp
diff --git a/third_party/errorprone/errorprone.gyp b/third_party/errorprone/errorprone.gyp
index 90235feb0e2582104a35629035cb22c3512b5243..0378dde56ea0a6e4866ccad32ee39504c41db748 100644
--- a/third_party/errorprone/errorprone.gyp
+++ b/third_party/errorprone/errorprone.gyp
@@ -12,7 +12,7 @@
       'target_name': 'error_prone_annotation_jar',
       'type': 'none',
       'variables': {
-        'jar_path': 'lib/error_prone_annotation-2.0.1.jar',
+        'jar_path': 'lib/error_prone_annotation-2.0.5.jar',
       },
       'includes': [
         '../../build/host_prebuilt_jar.gypi',
@@ -23,29 +23,29 @@
       'target_name': 'error_prone_annotations_jar',
       'type': 'none',
       'variables': {
-        'jar_path': 'lib/error_prone_annotations-2.0.1.jar',
+        'jar_path': 'lib/error_prone_annotations-2.0.5.jar',
       },
       'includes': [
         '../../build/host_prebuilt_jar.gypi',
       ]
     },
     {
-      # GN: //third_party/errorprone:javacutil_java
-      'target_name': 'javacutil_jar',
+      # GN: //third_party/errorprone:dataflow_java
+      'target_name': 'dataflow_jar',
       'type': 'none',
       'variables': {
-        'jar_path': 'lib/javacutil-1.8.10.jar',
+        'jar_path': 'lib/dataflow-1.8.10.jar',
       },
       'includes': [
         '../../build/host_prebuilt_jar.gypi',
       ]
     },
     {
-      # GN: //third_party/errorprone:dataflow_java
-      'target_name': 'dataflow_jar',
+      # GN: //third_party/errorprone:javac_java
+      'target_name': 'javac_jar',
       'type': 'none',
       'variables': {
-        'jar_path': 'lib/dataflow-1.8.10.jar',
+        'jar_path': 'lib/javac-1.9.0-dev-r2644-1.jar',
       },
       'includes': [
         '../../build/host_prebuilt_jar.gypi',
@@ -56,15 +56,14 @@
       'target_name': 'chromium_errorprone',
       'type': 'none',
       'variables': {
-        'jar_path': 'lib/error_prone_core-2.0.1.jar',
+        'jar_path': 'lib/error_prone_core-2.0.5.jar',
       },
       'dependencies': [
-        '../../build/android/setup.gyp:sun_tools_java',
         '../../third_party/findbugs/findbugs.gyp:format_string_jar',
         'error_prone_annotation_jar',
         'error_prone_annotations_jar',
-        'javacutil_jar',
         'dataflow_jar',
+        'javac_jar',
       ],
       'includes': [
         '../../build/host_prebuilt_jar.gypi',