Revert of Second attempt to land change to remove NativeViewportService and

mojo/services/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 
 group("services") {
   deps = [
     "//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",
     "//mojo/services/public/interfaces/geometry",
     "//mojo/services/public/interfaces/input_events",
     "//mojo/services/public/interfaces/native_viewport",
     "//mojo/services/public/interfaces/navigation",
     "//mojo/services/public/interfaces/network",
     "//mojo/services/public/interfaces/surfaces",
     "//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",
     ]
   }
 }