[Android] Refactor the native test wrappers. (RELAND)

testing/android/native_test/native_test_util.h

Index: testing/android/native_test/native_test_util.h
diff --git a/testing/android/native_test/native_test_util.h b/testing/android/native_test/native_test_util.h
index ef17e5207ea0a3e0ea3fcb0778a1557fc69ddeb8..e647a92201df4388d8f34cba80d38718017eb6a6 100644
--- a/testing/android/native_test/native_test_util.h
+++ b/testing/android/native_test/native_test_util.h
@@ -12,7 +12,7 @@
 // Helper methods for setting up environment for running gtest tests
 // inside an APK.
 namespace testing {
-namespace native_test_util {
+namespace android {
 
 class ScopedMainEntryLogger {
  public:
@@ -33,7 +33,7 @@ void ParseArgsFromCommandLineFile(
     const char* path, std::vector<std::string>* args);
 int ArgsToArgv(const std::vector<std::string>& args, std::vector<char*>* argv);
 
-}  // namespace native_test_util
+}  // namespace android
 }  // namespace testing
 
 #endif  // TESTING_ANDROID_NATIVE_TEST_UTIL_