GN: Fix support errorprone and java_binary

build/android/gyp/javac.py

Index: build/android/gyp/javac.py
diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py
index 4a9b9cdac58b3c1d51facf378fcfc96f9cd12d6c..dafe5dff0ab9a9f767c3105641283fa30a84cdaf 100755
--- a/build/android/gyp/javac.py
+++ b/build/android/gyp/javac.py
@@ -87,13 +87,15 @@ def DoJavac(
       # Chromium only allows UTF8 source files.  Being explicit avoids
       # javac pulling a default encoding from the user's environment.
       '-encoding', 'UTF-8',
-      '-source', '1.7',
-      '-target', '1.7',
       '-classpath', ':'.join(classpath),
       '-d', classes_dir]
 
   if bootclasspath:
-    javac_args.extend(['-bootclasspath', ':'.join(bootclasspath)])
+    javac_args.extend([
+        '-bootclasspath', ':'.join(bootclasspath),
+        '-source', '1.7',
+        '-target', '1.7',
+        ])
 
   if chromium_code:
     # TODO(aurimas): re-enable '-Xlint:deprecation' checks once they are fixed.