Revert of Add creation of ServiceManager to Content

mojo/mojo_public.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_system',
       'type': 'shared_library',
       'defines': [
         'MOJO_SYSTEM_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
@@ skipping 331 matching lines @@
         }],
       ],
       'include_dirs': [
         '..',
       ],
     },
     {
       'target_name': 'mojo_shell_bindings',
       'type': 'static_library',
       'sources': [
+        'public/shell/lib/application.cc',
+        'public/shell/lib/service.cc',
+        'public/shell/application.h',
+        'public/shell/service.h',
         'public/shell/shell.mojom',
       ],
       'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_bindings',
         'mojo_system',
       ],
       'export_dependent_settings': [
         'mojo_bindings',
-      ],
-    },
-    {
-      'target_name': 'mojo_shell_client',
-      'type': 'static_library',
-      'sources': [
-        'public/shell/lib/application.cc',
-        'public/shell/lib/service.cc',
-        'public/shell/application.h',
-        'public/shell/service.h',
-      ],
-      'dependencies': [
-        'mojo_shell_bindings',
-      ],
-      'export_dependent_settings': [
-        'mojo_shell_bindings',
+        'mojo_system',
       ],
     },
   ],
 }