Revert of Second attempt to land change to remove NativeViewportService and

mojo/services/BUILD.gn

Index: mojo/services/BUILD.gn
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
index 5b4498c9d174f1e3a02bcc4efa9bd008a0d6a2b4..90988abeaac0f72db9f79ca7bf8a885f21458233 100644
--- a/mojo/services/BUILD.gn
+++ b/mojo/services/BUILD.gn
@@ -9,6 +9,7 @@
     "//mojo/services/clipboard",
     "//mojo/services/gles2:bindings",
     "//mojo/services/html_viewer",
+    "//mojo/services/native_viewport",
     "//mojo/services/network",
     "//mojo/services/public/interfaces/clipboard",
     "//mojo/services/public/interfaces/content_handler",
@@ -21,14 +22,10 @@
     "//mojo/services/surfaces",
     "//mojo/services/test_service:bindings",
   ]
-  if (!is_android) {
-    deps += ["//mojo/services/native_viewport"]
-  }
   if (use_aura) {
     deps += [
       "//mojo/services/public/interfaces/view_manager",
       "//mojo/services/public/interfaces/window_manager",
-      "//mojo/services/view_manager",
       "//mojo/services/window_manager",
     ]
   }