Multiprocess test client: Android child process launcher rework.

mojo/edk/test/run_all_perftests.cc

Index: mojo/edk/test/run_all_perftests.cc
diff --git a/mojo/edk/test/run_all_perftests.cc b/mojo/edk/test/run_all_perftests.cc
index 50c41d7a758123999747f94e77bef48bd5170bbd..e5a40d8b229c2b4f89ba8940d63aa2142be08fcb 100644
--- a/mojo/edk/test/run_all_perftests.cc
+++ b/mojo/edk/test/run_all_perftests.cc
@@ -12,11 +12,17 @@
 #include "mojo/edk/test/test_support_impl.h"
 #include "mojo/public/tests/test_support_private.h"
 
-int main(int argc, char** argv) {
 #if defined(OS_ANDROID)
-  base::InitAndroidMultiProcessTestHelper(main);
+#include "base/test/android/android_main_function_thunk.h"
+
+int main(int argc, char** argv);
+namespace {
+// Needed for multiprocess tests to find the main function.
+base::android::AndroidMainFunctionThunk main_thunk(&main);
+}
 #endif
 
+int main(int argc, char** argv) {
   base::PerfTestSuite test(argc, argv);
 
   mojo::edk::Init();