Android: decouple mojo shell from the network service.

mojo/shell/context.cc

Index: mojo/shell/context.cc
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index 0d2c30f8a1fee9d05ceda9d859473b287a4a64b2..b1759a2d0461eac6132d615edcf616d62674f2d1 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -36,7 +36,6 @@
 
 #if defined(OS_ANDROID)
 #include "mojo/shell/android/android_handler_loader.h"
-#include "mojo/shell/network_application_loader.h"
 #include "services/gles2/gpu_impl.h"
 #include "services/native_viewport/native_viewport_impl.h"
 #endif  // defined(OS_ANDROID)
@@ -253,18 +252,10 @@ bool Context::Init() {
   }
 
 #if defined(OS_ANDROID)
-  // On android, the network service is bundled with the shell because the
-  // network stack depends on the android runtime.
-  {
-    scoped_ptr<BackgroundShellApplicationLoader> loader(
-        new BackgroundShellApplicationLoader(
-            scoped_ptr<ApplicationLoader>(new NetworkApplicationLoader()),
-            "network_service",
-            base::MessageLoop::TYPE_IO));
-    application_manager_.SetLoaderForURL(loader.Pass(),
-                                         GURL("mojo:network_service"));
-  }
   {
+    // Android handler is bundled with the Mojo shell, because it uses the
+    // MojoShell application as the JNI bridge to bootstrap execution of other
+    // Android Mojo apps that need JNI.
     scoped_ptr<BackgroundShellApplicationLoader> loader(
         new BackgroundShellApplicationLoader(
             scoped_ptr<ApplicationLoader>(new AndroidHandlerLoader()),