Relanding "Add apk for running content_browsertests"

content/test/run_all_unittests.cc

Index: content/test/run_all_unittests.cc
diff --git a/content/test/run_all_unittests.cc b/content/test/run_all_unittests.cc
index 58de889b765ddf1d7a207295c0be3811251eb2a5..695cebe9dc7a151f17abec3839408d9a680cbdb5 100644
--- a/content/test/run_all_unittests.cc
+++ b/content/test/run_all_unittests.cc
@@ -5,25 +5,7 @@
 #include "content/test/content_test_suite.h"
 #include "content/public/test/unittest_test_suite.h"
 
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "content/browser/android/browser_jni_registrar.h"
-#include "content/common/android/common_jni_registrar.h"
-#include "net/android/net_jni_registrar.h"
-#include "ui/android/ui_jni_registrar.h"
-#endif
-
 int main(int argc, char** argv) {
-
-#if defined(OS_ANDROID)
-  // Register JNI bindings for android.
-  JNIEnv* env = base::android::AttachCurrentThread();
-  content::android::RegisterCommonJni(env);
-  content::android::RegisterBrowserJni(env);
-  net::android::RegisterJni(env);
-  ui::android::RegisterJni(env);
-#endif
-
   return content::UnitTestTestSuite(
       new content::ContentTestSuite(argc, argv)).Run();
 }