Revert of Create native_viewport_service, don't build it into mojo_shell unless Android

mojo/mojo_examples.gypi

Index: mojo/mojo_examples.gypi
diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi
index decce3c3c5abd1a8a666f970425a8bcc4883f58b..a24f963a442539adf78c3f18c1a03317451b5162 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -81,7 +81,7 @@
       ],
       'sources': [
         'examples/sample_app/gles2_client_impl.cc',
-        'examples/sample_app/gles2_client_impl.h',
+        'examples/sample_app/gles2_client_impl.cc',
         'examples/sample_app/sample_app.cc',
         'examples/sample_app/spinning_cube.cc',
         'examples/sample_app/spinning_cube.h',
@@ -551,6 +551,7 @@
             '../skia/skia.gyp:skia',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
@@ -642,6 +643,7 @@
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             '../ui/resources/ui_resources.gyp:ui_resources',
             '../ui/resources/ui_resources.gyp:ui_test_pak',
             '../ui/views/views.gyp:views',
@@ -675,6 +677,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
@@ -698,6 +701,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',