Separate mojo/shell into a runner and the application manager (shell)

mojo/runner/android/library_loader.cc

 // Copyright 2013 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 "base/android/base_jni_onload.h"
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/bind.h"
 #include "components/native_viewport/platform_viewport_android.h"
-#include "mojo/shell/android/android_handler.h"
-#include "mojo/shell/android/main.h"
+#include "mojo/runner/android/android_handler.h"
+#include "mojo/runner/android/main.h"
 
 namespace {
 
 base::android::RegistrationMethod kMojoRegisteredMethods[] = {
     {"AndroidHandler", mojo::shell::RegisterAndroidHandlerJni},
     {"PlatformViewportAndroid",
      native_viewport::PlatformViewportAndroid::Register},
     {"ShellMain", mojo::shell::RegisterShellMain},
 };
 
@@ skipping 12 matching lines @@
   std::vector<base::android::RegisterCallback> register_callbacks;
   register_callbacks.push_back(base::Bind(&RegisterJNI));
   if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
       !base::android::OnJNIOnLoadInit(
           std::vector<base::android::InitCallback>())) {
     return -1;
   }
 
   return JNI_VERSION_1_4;
 }