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

mojo/services/native_viewport/BUILD.gn

Index: mojo/services/native_viewport/BUILD.gn
diff --git a/mojo/services/native_viewport/BUILD.gn b/mojo/services/native_viewport/BUILD.gn
index 25ccfbd967e18d2272f5d3a983c2e71ef829f22b..128aef9b834de39d412c4b20fbb7dd9a694bf8bf 100644
--- a/mojo/services/native_viewport/BUILD.gn
+++ b/mojo/services/native_viewport/BUILD.gn
@@ -5,21 +5,9 @@
 import("//build/config/ui.gni")
 import("//mojo/system.gni")
 
-if (!is_android) {
-  shared_library("native_viewport") {
-    output_name = "mojo_native_viewport_service"
+static_library("native_viewport") {
+  output_name = "mojo_native_viewport"
 
-    deps = [
-      ":lib",
-      "//mojo/services/public/interfaces/native_viewport",
-    ]
-    deps += mojo_system_for_shared_library
-
-    sources = [ "main.cc" ]
-  }
-}
-
-source_set("lib") {
   deps = [
     "//base",
     "//cc/surfaces",
@@ -61,6 +49,13 @@
     deps += [ "//mojo:jni_headers" ]
   }
 
+  if (is_win) {
+    deps += [
+      # TODO(GYP)
+      # '../ui/platform_window/win/win_window.gyp:win_window',
+    ]
+  }
+
   if (use_x11) {
     sources += [ "platform_viewport_x11.cc" ]
     deps += [