[DeviceService] Cleanup of android library dependencies.

services/device/BUILD.gn

 # Copyright 2016 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/features.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 source_set("lib") {
+  # This should be visible only to embedders of the Device Service, and the
+  # dependence should only be for the purpose of embedding the Device Service.
+  visibility = [ "//content/browser" ]
   sources = [
     "device_service.cc",
     "device_service.h",
   ]
 
   deps = [
     "//base",
     "//device/battery:mojo_bindings",
     "//device/sensors",
     "//device/vibration:mojo_bindings",
@@ skipping 54 matching lines @@
 
 if (is_android) {
   generate_jni("device_service_jni_headers") {
     sources = [
       "android/java/src/org/chromium/services/device/InterfaceRegistrar.java",
     ]
     jni_package = "device_service"
   }
 
   android_library("java") {
-    java_files = [
-      "android/java/src/org/chromium/services/device/InterfaceRegistrar.java",
-      "screen_orientation/android/java/src/org/chromium/device/screen_orientation/ScreenOrientationListener.java",
-      "time_zone_monitor/android/java/src/org/chromium/device/time_zone_monitor/TimeZoneMonitor.java",
-    ]
+    # This should be visible only to embedders of the Device Service, and the
+    # dependence should only be for the purpose of embedding the Device Service.
+    # //content/public/android:* here actually wants to identify the
+    # //content/public/android:content_java target and all of its generated
+    # targets which also need to see this target as well.
+    visibility = [ "//content/public/android:*" ]
+    java_files = [ "android/java/src/org/chromium/services/device/InterfaceRegistrar.java" ]
     deps = [
       "//base:base_java",
       "//device/battery:mojo_bindings_java",
       "//device/battery/android:battery_monitor_java",
       "//device/vibration:mojo_bindings_java",
       "//device/vibration/android:vibration_manager_java",
       "//mojo/android:system_java",
       "//mojo/public/java:bindings_java",
       "//mojo/public/java:system_java",
+      "//services/device/screen_orientation:java",
+      "//services/device/time_zone_monitor:java",
       "//services/service_manager/public/interfaces:interfaces_java",
       "//services/service_manager/public/java:service_manager_java",
-      "//ui/android:ui_java",
     ]
   }
 }