Revert of Multiprocess test client: Android child process launcher rework.

mojo/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/rules.gni")
 
 group("android") {
   testonly = true
   deps = [
     ":mojo_javatests",
@@ skipping 113 matching lines @@
     "javatests/mojo_test_case.h",
     "javatests/validation_test_util.cc",
     "javatests/validation_test_util.h",
   ]
 
   deps = [
     ":jni_headers",
     ":libsystem_java",
     ":system_java_jni_headers",
     "//base",
-    "//base/test:test_support",
-    "//base/test:test_support_main_stub",
+    "//base/test/:test_support",
     "//build/config/sanitizers:deps",
     "//mojo/edk/system",
     "//mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils",
     "//mojo/public/cpp/test_support:test_utils",
   ]
   defines = [ "UNIT_TEST" ]
 }
 
 instrumentation_test_apk("mojo_test_apk") {
   deps = [
     ":mojo_javatests",
     ":system_java",
     "//base:base_java",
     "//mojo/public/interfaces/bindings/tests:test_interfaces",
     "//mojo/public/java:bindings_java",
     "//third_party/android_support_test_runner:runner_java",
   ]
   shared_libraries = [ ":mojo_java_unittests" ]
   apk_name = "MojoTest"
   android_manifest = "javatests/AndroidManifest.xml"
 }