Fix mojo and mandoline android build breaks.

mojo/runner/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/ui.gni")
 import("//third_party/mojo/src/mojo/public/mojo.gni")
 import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
 # We don't support building in the component build since mojo apps are
 # inherently components.
 assert(!is_component_build)
 
 group("runner") {
   testonly = true
 
   deps = [
     ":mojo_runner",
-    ":tests",
-    "//mojo/shell:tests",
+    ":mojo_runner_unittests",
+    "//mojo/shell:mojo_shell_unittests",
   ]
 
   if (is_android) {
     deps += [
       ":mojo_runner_apk",
-      ":tests_apk",
+      ":mojo_runner_unittests_apk",
     ]
   }
 }
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 executable("mojo_runner") {
@@ skipping 287 matching lines @@
 mojom("child_process_bindings") {
   sources = [
     "child_process.mojom",
   ]
 
   deps = [
     "//third_party/mojo/src/mojo/public/interfaces/application",
   ]
 }
 
-test("tests") {
-  output_name = "mojo_runner_unittests"
-
+test("mojo_runner_unittests") {
   sources = [
     "child_process_host_unittest.cc",
     "data_pipe_peek_unittest.cc",
     "in_process_native_runner_unittest.cc",
     "native_runner_unittest.cc",
     "shell_test_base.cc",
     "shell_test_base.h",
     "shell_test_base_android.cc",
     "shell_test_base_unittest.cc",
     "shell_test_main.cc",
@@ skipping 57 matching lines @@
     #"//mojo/services/http_server/public/interfaces",
     "//mojo/services/network/public/interfaces",
 
     "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
     "//third_party/mojo/src/mojo/public/cpp/environment",
     "//third_party/mojo/src/mojo/public/cpp/system:system",
   ]
 
   #data_deps = [ "//services/http_server:http_server($default_toolchain)" ]
 }