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

testing/android/native_test/native_test_launcher.cc

Index: testing/android/native_test/native_test_launcher.cc
diff --git a/testing/android/native_test/native_test_launcher.cc b/testing/android/native_test/native_test_launcher.cc
index a0c3ef1ae0f04fcadfa897660533d7158d6b1507..2389c731a681c50c71f145803bbdf7d30c9d7f9f 100644
--- a/testing/android/native_test/native_test_launcher.cc
+++ b/testing/android/native_test/native_test_launcher.cc
@@ -24,7 +24,6 @@
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "base/test/android/test_support_jni_registrar.h"
 #include "base/test/test_support_android.h"
 #include "gtest/gtest.h"
 #include "jni/NativeTest_jni.h"
@@ -129,10 +128,9 @@
 }
 
 bool RegisterNativeTestJNI(JNIEnv* env) {
-  if (!base::android::RegisterJni(env))
+  if (!base::android::RegisterJni(env)) {
     return false;
-  if (!base::android::RegisterTestSupportJni(env))
-    return false;
+  }
   return RegisterNativesImpl(env);
 }