Revert of Reverting due to Android builders breakage. Subsequent fixes did not fix.

chrome/android/BUILD.gn

 # 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")
 import("//build/config/android/rules.gni")
 import("//build/module_args/v8.gni")
 import("//chrome/version.gni")
 import("//third_party/icu/config.gni")
 import("channel.gni")
@@ skipping 329 matching lines @@
 jinja_template("chrome_shell_manifest") {
   testonly = true
   input = "shell/java/AndroidManifest.xml.jinja2"
   output = chrome_shell_manifest
 }
 
 # GYP: //chrome/chrome_shell.gypi:chrome_shell_apk
 android_apk("chrome_shell_apk") {
   testonly = true
   deps = [
+    "//base:base_java",
     ":chrome_shell_resources",
     ":chrome_shell_java",
     ":chrome_shell_assets",
     ":chrome_shell",
   ]
   apk_name = "ChromeShell"
   android_manifest = chrome_shell_manifest
   native_libs = [ "libchrome_shell.so" ]
   asset_location = chrome_shell_assets_dir
 
@@ skipping 16 matching lines @@
 jinja_template("chrome_sync_shell_manifest") {
   testonly = true
   input = "sync_shell/java/AndroidManifest.xml.jinja2"
   output = chrome_sync_shell_manifest
 }
 
 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk
 android_apk("chrome_sync_shell_apk") {
   testonly = true
   deps = [
+    "//base:base_java",
     ":chrome_shell_resources",
     ":chrome_shell_java",
     ":chrome_shell_assets",
     ":chrome_sync_shell",
   ]
   apk_name = "ChromeSyncShell"
   android_manifest = chrome_sync_shell_manifest
   native_libs = [ "libchrome_sync_shell.so" ]
   asset_location = chrome_shell_assets_dir
 }
@@ skipping 111 matching lines @@
   ]
 }
 
 zip("chrome_version_srcjar") {
   inputs = [
     chrome_version_java_file,
   ]
   output = "$target_gen_dir/$target_name.srcjar"
   base_dir = chrome_version_java_dir
 }