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

mojo/shell/BUILD.gn

Index: mojo/shell/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index a69dcf068dd4dbfa842e77f3d2af4c9a1e9e67a0..eb62ff2adf8d2bfd6bbe349212267957a123dc32 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -12,6 +12,10 @@
     "//mojo/common",
     "//mojo/environment:chromium",
     "//mojo/application_manager",
+    "//mojo/system",
+    "//third_party/icu",
+    "//ui/gl",
+    "//url",
   ]
 
   if (use_ozone) {
@@ -36,9 +40,13 @@
     "//mojo/common",
     "//mojo/gles2",
     "//mojo/public/interfaces/application",
+    "//mojo/services/native_viewport",
+    "//mojo/services/public/interfaces/native_viewport",
     "//mojo/services/public/interfaces/network",
     "//mojo/spy",
     "//mojo/system",
+    "//net",
+    "//url",
   ]
 
   sources = [
@@ -81,12 +89,23 @@
     ]
   } else if (is_android) {
     deps += [
-      "//mojo/services/native_viewport:lib",
       "//mojo/services/network:lib",
     ]
     sources += [
       "network_application_loader.cc",
       "network_application_loader.h",
+    ]
+  }
+  if (use_aura) {
+    deps += [
+      # These are only necessary as long as we hard code use of ViewManager.
+      "//skia",
+      "//mojo/services/view_manager",
+      "//mojo/services/public/interfaces/view_manager",
+    ]
+    sources += [
+      "view_manager_loader.cc",
+      "view_manager_loader.h",
     ]
   }
 }