Roll Chrome into Mojo.

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index f83d92f1d8c77b2b47312caccedc074dbb9ef20d..54178634bc9bde2d368fdf6cfbb5f318e90ba62c 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1428,6 +1428,8 @@ template("android_apk") {
 #     (which will be correct unless that target specifies an "output_name".
 #     TODO(brettw) make this automatic by allowing get_target_outputs to
 #     support executables.
+#   apk_name: The name of the produced apk. If unspecified, it uses the name
+#             of the unittests_dep target postfixed with "_apk"
 #
 # Example
 #   unittest_apk("foo_unittests_apk") {
@@ -1441,16 +1443,29 @@ template("unittest_apk") {
 
   test_suite_name = get_label_info(invoker.unittests_dep, "name")
 
+  # This trivial assert is needed in case both unittests_binary and apk_name
+  # are defined, as otherwise test_suite_name would not be used.
+  assert(test_suite_name != "")
+
   if (defined(invoker.unittests_binary)) {
     unittests_binary = invoker.unittests_binary
   } else {
     unittests_binary = "lib" + test_suite_name + ".so"
   }
 
+  if (defined(invoker.apk_name)) {
+    apk_name = invoker.apk_name
+  } else {
+    apk_name = test_suite_name
+  }
+
   android_apk(target_name) {
-    _apk_name = test_suite_name
+    _apk_name = apk_name
     final_apk_path = "$root_build_dir/${_apk_name}_apk/${_apk_name}-debug.apk"
-    java_files = [ "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java" ]
+    java_files = [
+      "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java",
+      "//testing/android/java/src/org/chromium/native_test/ChromiumNativeTestInstrumentationTestRunner.java",
+    ]
     android_manifest = "//testing/android/java/AndroidManifest.xml"
     native_libs = [ unittests_binary ]
     if (defined(invoker.asset_location)) {
@@ -1458,6 +1473,7 @@ template("unittest_apk") {
     }
     deps = [
       "//base:base_java",
+      "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
     ]
     if (defined(invoker.deps)) {
       deps += invoker.deps