Move mojo/runner to mojo/shell/standalone

mandoline/app/android/mandoline_activity.cc

Index: mandoline/app/android/mandoline_activity.cc
diff --git a/mandoline/app/android/mandoline_activity.cc b/mandoline/app/android/mandoline_activity.cc
index 6ad7a8cbcb8df32b2cfa2d06fe0522bcd1443976..e76b4b9c8bb5f3fd29f4f071d78c6e9a6c44b134 100644
--- a/mandoline/app/android/mandoline_activity.cc
+++ b/mandoline/app/android/mandoline_activity.cc
@@ -5,9 +5,9 @@
 #include "base/android/jni_string.h"
 #include "jni/MandolineActivity_jni.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/launch_handler.mojom.h"
-#include "mojo/runner/android/main.h"
-#include "mojo/runner/context.h"
 #include "mojo/shell/connect_util.h"
+#include "mojo/shell/standalone/android/main.h"
+#include "mojo/shell/standalone/context.h"
 
 namespace mandoline {
 
@@ -16,7 +16,7 @@ static void LaunchURL(JNIEnv* env,
                       const JavaParamRef<jstring>& jurl) {
   LaunchHandlerPtr launch_handler;
   mojo::shell::ConnectToService(
-      mojo::runner::GetContext()->application_manager(), GURL("mojo:phone_ui"),
+      mojo::shell::GetContext()->application_manager(), GURL("mojo:phone_ui"),
       &launch_handler);
   launch_handler->LaunchURL(
       base::android::ConvertJavaStringToUTF8(env, jurl));