Bundle the network service in the shell on Android.

mojo/mojo_services.gypi

Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 04342c4e9eb995ee08ab148a72361f6fcd6c7cf7..f31f11cc2710ba55359173e05a54afde037d9d03 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -361,8 +361,8 @@
       ],
     },
     {
-      'target_name': 'mojo_network_service',
-      'type': 'loadable_module',
+      'target_name': 'mojo_network_service_lib',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
@@ -371,14 +371,11 @@
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_network_bindings',
-        'mojo_profile_service_bindings',
-        '<(mojo_system_for_loadable_module)',
       ],
       'export_dependent_settings': [
         'mojo_network_bindings',
       ],
       'sources': [
-        'services/network/main.cc',
         'services/network/network_context.cc',
         'services/network/network_context.h',
         'services/network/network_service_impl.cc',
@@ -388,6 +385,21 @@
       ],
     },
     {
+      'target_name': 'mojo_network_service',
+      'type': 'loadable_module',
+      'dependencies': [
+        'mojo_network_bindings',
+        'mojo_network_service_lib',
+        '<(mojo_system_for_loadable_module)',
+      ],
+      'export_dependent_settings': [
+        'mojo_network_bindings',
+      ],
+      'sources': [
+        'services/network/main.cc',
+      ],
+    },
+    {
       'target_name': 'mojo_surfaces_service',
       'type': 'shared_library',
       'dependencies': [
@@ -621,32 +633,6 @@
         'services/test_service/test_request_tracker_impl.h',
       ],
     },
-    {
-      'target_name': 'mojo_profile_service_bindings',
-      'type': 'static_library',
-      'sources': [
-        'services/public/interfaces/profile/profile_service.mojom',
-      ],
-      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-      'dependencies': [
-        'mojo_cpp_bindings',
-      ],
-    },
-    {
-      'target_name': 'mojo_profile_service',
-      'type': 'static_library',
-      'sources': [
-        'services/profile/profile_service_impl.cc',
-        'services/profile/profile_service_impl.h',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        'mojo_profile_service_bindings',
-      ],
-    },
   ],
   'conditions': [
     ['use_aura==1', {