Fix mojo and mandoline android build breaks.

mojo/shell/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("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
 source_set("shell") {
   output_name = "mojo_shell"
   sources = [
@@ skipping 31 matching lines @@
     "//crypto:crypto",
     "//url",
     "//third_party/mojo/src/mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/util:filename_util",
     "//third_party/mojo_services/src/content_handler/public/interfaces",
     "//mojo/runner:native_application_support",
   ]
 }
 
-test("tests") {
-  output_name = "mojo_shell_unittests"
-
+test("mojo_shell_unittests") {
   sources = [
     "application_manager_unittest.cc",
     "query_util_unittest.cc",
   ]
 
   deps = [
     ":shell",
     ":test_bindings",
     "//base",
     "//mojo/application",
     "//mojo/common",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//mojo/environment:chromium",
     "//third_party/mojo/src/mojo/public/cpp/application",
     "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//testing/gtest",
     "//url",
   ]
 }
 
 mojom("test_bindings") {
   sources = [
     "test.mojom",
   ]
 }