Get sample_app running on Android again

mojo/mojo_services.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_gles2_bindings',
       'type': 'static_library',
       'sources': [
         'services/gles2/command_buffer.mojom',
         'services/gles2/command_buffer_type_conversions.cc',
         'services/gles2/command_buffer_type_conversions.h',
         'services/gles2/mojo_buffer_backing.cc',
@@ skipping 42 matching lines @@
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_bindings',
       ],
       'dependencies': [
         'mojo_bindings',
       ],
     },
     {
       'target_name': 'mojo_native_viewport_service',
-      'type': 'shared_library',
+      # This is linked directly into the embedder, so we make it a component.
+      'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_gles2_service',
         'mojo_native_viewport_bindings',
         'mojo_shell_client',
@@ skipping 21 matching lines @@
         }],
         ['OS=="android"', {
           'dependencies': [
             'mojo_jni_headers',
           ],
         }],
       ],
     },
   ],
 }