Revert of [Android] Refactor the native test wrappers.

testing/android/native_test/native_test_util.cc

Index: testing/android/native_test/native_test_util.cc
diff --git a/testing/android/native_test/native_test_util.cc b/testing/android/native_test/native_test_util.cc
index ffb1b114e4724720c16be75f5d979e87ede83cb1..2eaf9718ba79ec242d4d09269f8c91eeb79f6d19 100644
--- a/testing/android/native_test/native_test_util.cc
+++ b/testing/android/native_test/native_test_util.cc
@@ -10,7 +10,7 @@
 #include "base/strings/string_util.h"
 
 namespace testing {
-namespace android {
+namespace native_test_util {
 
 void ParseArgsFromString(const std::string& command_line,
                          std::vector<std::string>* args) {
@@ -46,5 +46,5 @@
   return argc;
 }
 
-}  // namespace android
+}  // namespace native_test_util
 }  // namespace testing