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

mojo/runner/android/main.cc

Index: mojo/runner/android/main.cc
diff --git a/mojo/shell/android/main.cc b/mojo/runner/android/main.cc
similarity index 94%
rename from mojo/shell/android/main.cc
rename to mojo/runner/android/main.cc
index 0e6c917ea184927da889879810da600f628098bc..a610f2207f0b2d2bc19b6b3bed97fec0508a1a4b 100644
--- a/mojo/shell/android/main.cc
+++ b/mojo/runner/android/main.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/shell/android/main.h"
+#include "mojo/runner/android/main.h"
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
@@ -21,13 +21,13 @@
 #include "base/threading/simple_thread.h"
 #include "jni/ShellMain_jni.h"
 #include "mojo/common/message_pump_mojo.h"
-#include "mojo/shell/android/android_handler_loader.h"
-#include "mojo/shell/android/background_application_loader.h"
-#include "mojo/shell/android/native_viewport_application_loader.h"
-#include "mojo/shell/android/ui_application_loader_android.h"
-#include "mojo/shell/application_manager/application_loader.h"
-#include "mojo/shell/context.h"
-#include "mojo/shell/init.h"
+#include "mojo/runner/android/android_handler_loader.h"
+#include "mojo/runner/android/background_application_loader.h"
+#include "mojo/runner/android/native_viewport_application_loader.h"
+#include "mojo/runner/android/ui_application_loader_android.h"
+#include "mojo/runner/context.h"
+#include "mojo/runner/init.h"
+#include "mojo/shell/application_loader.h"
 #include "ui/gl/gl_surface_egl.h"
 
 using base::LazyInstance;