Fix IPC and base tests on ASAN Android bot.

testing/android/native_test/main_runner.cc

 // Copyright 2017 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.
 
 #include <vector>
 
 #include "base/android/jni_array.h"
 #include "base/logging.h"
 #include "base/posix/global_descriptors.h"
 #include "jni/MainRunner_jni.h"
+#include "testing/android/native_test/native_test_util.h"
 
 extern int main(int argc, char** argv);
 
 namespace testing {
 namespace android {
 
 bool RegisterMainRunnerJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
@@ skipping 16 matching lines @@
   base::android::JavaIntArrayToIntVector(env, fds_to_map_fds, &fds);
   CHECK_EQ(keys.size(), fds.size());
 
   for (size_t i = 0; i < keys.size(); i++) {
     base::GlobalDescriptors::GetInstance()->Set(keys[i], fds[i]);
   }
 
   std::vector<std::string> cpp_command_line;
   AppendJavaStringArrayToStringVector(env, command_line, &cpp_command_line);
 
-  std::vector<char*> c_command_line;
-  for (auto& entry : cpp_command_line) {
-    c_command_line.push_back(&entry[0]);
-  }
-
-  return main(c_command_line.size(), &c_command_line[0]);
+  std::vector<char*> argv;
+  int argc = ArgsToArgv(cpp_command_line, &argv);
+  return main(argc, &argv[0]);
 }
 
 }  // namespace android
 }  // namespace testing