Reland: Run mojo unit tests on the Android main waterfall.

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("//mojo/generate_mojo_shell_assets_list.gni")
 import("//mojo/public/mojo_application.gni")
 import("//testing/test.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # We don't support building in the component build since mojo apps are
@@ skipping 364 matching lines @@
     "child_process.mojom",
   ]
 
   deps = [
     "//mojo/application/public/interfaces",
   ]
 
   import_dirs = [ "//mojo/services" ]
 }
 
-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 47 matching lines @@
   ]
 
   deps = [
     "//base",
     "//mojo/application/public/cpp:test_support",
     "//mojo/runner/test:bindings",
     "//mojo/services/network/public/interfaces",
     "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
   ]
 }