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

third_party/errorprone/errorprone.gyp

 # Copyright 2014 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.
 
 {
   'variables': {
     'errorprone_script_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
   },
   'targets': [
     {
       # GN: //third_party/errorprone:error_prone_annotation_java
       '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',
       ]
     },
     {
       # GN: //third_party/errorprone:error_prone_annotations_java
       'target_name': 'error_prone_annotations_jar',
       'type': 'none',
       'variables': {
-        'jar_path': 'lib/error_prone_annotations-2.0.1.jar',
-      },
-      'includes': [
-        '../../build/host_prebuilt_jar.gypi',
-      ]
-    },
-    {
-      # GN: //third_party/errorprone:javacutil_java
-      'target_name': 'javacutil_jar',
-      'type': 'none',
-      'variables': {
-        'jar_path': 'lib/javacutil-1.8.10.jar',
+        'jar_path': 'lib/error_prone_annotations-2.0.5.jar',
       },
       'includes': [
         '../../build/host_prebuilt_jar.gypi',
       ]
     },
     {
       # GN: //third_party/errorprone:dataflow_java
       'target_name': 'dataflow_jar',
       'type': 'none',
       'variables': {
         'jar_path': 'lib/dataflow-1.8.10.jar',
       },
       'includes': [
         '../../build/host_prebuilt_jar.gypi',
+      ]
+    },
+    {
+      # GN: //third_party/errorprone:javac_java
+      'target_name': 'javac_jar',
+      'type': 'none',
+      'variables': {
+        'jar_path': 'lib/javac-1.9.0-dev-r2644-1.jar',
+      },
+      'includes': [
+        '../../build/host_prebuilt_jar.gypi',
       ]
     },
     {
       # GN: //third_party/errorprone:chromium_errorprone
       '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',
       ],
       'actions': [
         {
           'action_name': 'create_errorprone_binary_script',
           'inputs': [
             '<(DEPTH)/build/android/gyp/create_java_binary_script.py',
             '<(DEPTH)/build/android/gyp/util/build_utils.py',
@@ skipping 32 matching lines @@
             '<(required_file)',
           ],
           'action': [
             'python', '../../build/android/gyp/touch.py', '<(required_file)',
           ],
         },
       ],
     },
   ],
 }