Update from https://crrev.com/305340

build/config/android/internal_rules.gni

 # 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.
 
 import("//build/config/android/config.gni")
 
 assert(is_android)
 
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
@@ skipping 195 matching lines @@
       args += [
         "--dex-path", rebase_path(invoker.dex_path, root_build_dir),
       ]
     }
     if (supports_android) {
       args += [ "--supports-android" ]
     }
     if (requires_android) {
       args += [ "--requires-android" ]
     }
+    if (defined(invoker.bypass_platform_checks) &&
+        invoker.bypass_platform_checks) {
+      args += [ "--bypass-platform-checks" ]
+    }
 
     if (is_android_resources || is_apk) {
       assert(defined(invoker.resources_zip))
       args += [
         "--resources-zip", rebase_path(invoker.resources_zip, root_build_dir),
       ]
       if (defined(invoker.android_manifest)) {
         inputs += [
           invoker.android_manifest
         ]
@@ skipping 401 matching lines @@
       "--classpath=@FileArg($_rebased_build_config:javac:classpath)",
       "--jar-path=$_rebased_jar_path",
       "--java-srcjars=$_rebased_java_srcjars",
       "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
       "--jar-excluded-classes=$_jar_excluded_patterns",
     ]
     if (_chromium_code) {
       args += [ "--chromium-code=1" ]
     }
 
-    if (defined(invoker.main_class)) {
-      args += [
-        "--main-class", invoker.main_class
-      ]
-    }
-
     args += rebase_path(_java_files, root_build_dir)
   }
 
   _final_deps += [ ":${_template_name}__finish" ]
   process_java_prebuilt("${_template_name}__finish") {
     build_config = _build_config
     input_jar_path = _intermediate_jar_path
     output_jar_path = _final_jar_path
     if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
       proguard_preprocess = invoker.proguard_preprocess
@@ skipping 39 matching lines @@
 
   if (defined(invoker.override_build_config)) {
     _build_config = invoker.override_build_config
   } else {
     _build_config = _base_path + ".build_config"
     _final_deps += [ ":${_template_name}__build_config" ]
     write_build_config("${_template_name}__build_config") {
       type = "java_library"
       supports_android = _supports_android
       requires_android = _requires_android
+      bypass_platform_checks = (defined(invoker.bypass_platform_checks) &&
+        invoker.bypass_platform_checks)
 
       deps = []
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
 
       build_config = _build_config
       jar_path = _jar_path
       if (_supports_android) {
         dex_path = _dex_path
@@ skipping 45 matching lines @@
   compile_java("${_template_name}__compile_java") {
     jar_path = _jar_path
     build_config = _build_config
     java_files = _java_files
     srcjar_deps = _srcjar_deps
     srcjars = _srcjars
     chromium_code = _chromium_code
     android = _requires_android
 
     if (defined(invoker.jar_excluded_patterns)) { jar_excluded_patterns = invoker.jar_excluded_patterns }
-    if (defined(invoker.main_class)) { main_class = invoker.main_class }
     if (defined(invoker.proguard_preprocess)) { proguard_preprocess = invoker.proguard_preprocess }
     if (defined(invoker.proguard_config)) { proguard_config = invoker.proguard_config }
     if (defined(invoker.dist_jar_path)) { dist_jar_path = invoker.dist_jar_path }
   }
 
   if (defined(invoker.main_class)) {
     _final_deps += [ ":${_template_name}__binary_script" ]
     action("${_template_name}__binary_script") {
       script = "//build/android/gyp/create_java_binary_script.py"
       depfile = "$target_gen_dir/$target_name.d"
@@ skipping 161 matching lines @@
 
     if (defined(invoker.clear_dir) && invoker.clear_dir) {
       args += ["--clear"]
     }
 
     if (defined(invoker.args)) {
       args += invoker.args
     }
   }
 }