Revert of [Android] Refactor the native test wrappers.

testing/android/native_test/BUILD.gn

Index: testing/android/native_test/BUILD.gn
diff --git a/testing/android/native_test/BUILD.gn b/testing/android/native_test/BUILD.gn
index 0e8ffcb581b7f55d904baa0697845278eca51d67..5df47fd2bd1f9ca7ebbb61806d51b9378769afe5 100644
--- a/testing/android/native_test/BUILD.gn
+++ b/testing/android/native_test/BUILD.gn
@@ -4,34 +4,22 @@
 
 import("//build/config/android/rules.gni")
 
-# GYP: //testing/android/native_test.gyp:native_test_support
-source_set("native_test_support") {
-  testonly = true
-  sources = [
-    "native_test_launcher.cc",
-    "native_test_launcher.h",
-    "native_test_util.cc",
-    "native_test_util.h",
-  ]
-  deps = [
-    ":native_test_jni_headers",
-    "//base",
-    "//base/test:test_support",
-    "//base/third_party/dynamic_annotations",
-    "//testing/gtest",
-  ]
-}
-
 # GYP: //testing/android/native_test.gyp:native_test_native_code
 source_set("native_test_native_code") {
   testonly = true
   sources = [
     "native_test_jni_onload.cc",
+    "native_test_launcher.cc",
+    "native_test_launcher.h",
   ]
   libs = [ "log" ]
   deps = [
-    ":native_test_support",
+    ":native_test_jni_headers",
+    ":native_test_util",
     "//base",
+    "//base/test:test_support",
+    "//base/third_party/dynamic_annotations",
+    "//testing/gtest",
   ]
 }
 
@@ -42,3 +30,14 @@
   ]
   jni_package = "testing"
 }
+
+# GYP: //testing/android/native_test.gyp:native_test_util
+source_set("native_test_util") {
+  sources = [
+    "native_test_util.cc",
+    "native_test_util.h",
+  ]
+  deps = [
+    "//base",
+  ]
+}