Clean up WTH creation

mojo/mojo_services.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_echo_bindings',
       'type': 'static_library',
       'sources': [
         'services/dbus_echo/echo.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
@@ skipping 413 matching lines @@
             '../ui/aura/aura.gyp:aura',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/compositor/compositor.gyp:compositor',
             '../ui/events/events.gyp:events',
             '../ui/events/events.gyp:events_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
             'mojo_application',
-            'mojo_aura_support',
+            'mojo_cc_support',
             'mojo_common_lib',
             'mojo_environment_chromium',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_gles2',
             'mojo_input_events_bindings',
             'mojo_input_events_lib',
             'mojo_native_viewport_bindings',
             'mojo_system_impl',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
           ],
           'sources': [
             'public/cpp/application/lib/mojo_main_chromium.cc',
             'services/view_manager/ids.h',
             'services/view_manager/main.cc',
             'services/view_manager/node.cc',
             'services/view_manager/node.h',
             'services/view_manager/node_delegate.h',
             'services/view_manager/root_node_manager.cc',
             'services/view_manager/root_node_manager.h',
             'services/view_manager/root_view_manager.cc',
             'services/view_manager/root_view_manager.h',
             'services/view_manager/root_view_manager_delegate.h',
+            'services/view_manager/screen_impl.cc',
+            'services/view_manager/screen_impl.h',
             'services/view_manager/view.cc',
             'services/view_manager/view.h',
             'services/view_manager/view_manager_export.h',
             'services/view_manager/view_manager_init_service_impl.cc',
             'services/view_manager/view_manager_init_service_impl.h',
             'services/view_manager/view_manager_service_impl.cc',
             'services/view_manager/view_manager_service_impl.h',
             'services/view_manager/context_factory_impl.cc',
             'services/view_manager/context_factory_impl.h',
             'services/view_manager/window_tree_host_impl.cc',
@@ skipping 73 matching lines @@
             'mojo_system_impl',
           ],
           'sources': [
             'services/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
     }],
   ],
 }