Consolidate JNI registrations for mojo system.

mojo/android/javatests/init_library.cc

Index: mojo/android/javatests/init_library.cc
diff --git a/mojo/android/javatests/init_library.cc b/mojo/android/javatests/init_library.cc
index 9e1a593011a6b69ec8c6b72acbc8957aaec8f817..6d6b2861edd2b7d9a3f4ba3a87b800cca234582b 100644
--- a/mojo/android/javatests/init_library.cc
+++ b/mojo/android/javatests/init_library.cc
@@ -10,17 +10,15 @@
 #include "base/bind.h"
 #include "mojo/android/javatests/mojo_test_case.h"
 #include "mojo/android/javatests/validation_test_util.h"
-#include "mojo/android/system/core_impl.h"
-#include "mojo/android/system/watcher_impl.h"
+#include "mojo/android/system/mojo_jni_registrar.h"
 #include "mojo/edk/embedder/embedder.h"
 
 namespace {
 
 base::android::RegistrationMethod kMojoRegisteredMethods[] = {
-    {"CoreImpl", mojo::android::RegisterCoreImpl},
+    {"MojoSystem", mojo::android::RegisterSystemJni},
     {"MojoTestCase", mojo::android::RegisterMojoTestCase},
     {"ValidationTestUtil", mojo::android::RegisterValidationTestUtil},
-    {"WatcherImpl", mojo::android::RegisterWatcherImpl},
 };
 
 bool RegisterJNI(JNIEnv* env) {