Move //mojo/services/X/public/... to //mojo/services/X/... (part 2).

services/keyboard_native/BUILD.gn

 # Copyright 2015 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("//mojo/public/mojo_application.gni")
 import("//mojo/tools/embed/rules.gni")
 
 mojo_native_application("keyboard_native") {
   sources = [
     "animation.h",
@@ skipping 25 matching lines @@
     ":lower_case_icon",
     ":upper_case_icon",
     "//base",
     "//mojo/application",
     "//mojo/public/cpp/bindings",
     "//mojo/gpu",
     "//mojo/public/c/gpu",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/cpp/utility",
     "//mojo/public/interfaces/application",
-    "//mojo/services/geometry/public/cpp",
-    "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/keyboard/public/interfaces",
+    "//mojo/services/geometry/cpp",
+    "//mojo/services/geometry/interfaces",
+    "//mojo/services/keyboard/interfaces",
     "//mojo/services/prediction/public/interfaces",
     "//mojo/services/surfaces/public/cpp",
     "//mojo/services/surfaces/public/interfaces",
     "//mojo/services/surfaces/public/interfaces:surface_id",
     "//mojo/services/view_manager/public/cpp",
     "//mojo/skia",
     "//skia",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
@@ skipping 15 matching lines @@
   source = "res/ArrowDown.png"
   namespace = "keyboard_native"
   variable = "kLowerCaseIcon"
 }
 
 embed_file("upper_case_icon") {
   source = "res/ArrowUp.png"
   namespace = "keyboard_native"
   variable = "kUpperCaseIcon"
 }