Restructure public side of surfaces service.

mojo/converters/surfaces/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.
 
 # GYP version: mojo/mojo_converters.gypi:mojo_surfaces_lib
 component("surfaces") {
   output_name = "mojo_surfaces_lib"
 
   sources = [
     "mojo_surfaces_export.h",
     "surfaces_type_converters.cc",
     "surfaces_type_converters.h",
   ]
 
   defines = [ "MOJO_SURFACES_IMPLEMENTATION" ]
 
   public_deps = [
     "//mojo/converters/geometry",
   ]
 
   deps = [
     "//base",
     "//cc",
     "//cc/surfaces",
     "//cc/surfaces:surface_id",
     "//gpu",
     "//mojo/environment:chromium",
     "//mojo/public/c/system",
-    "//mojo/services/public/interfaces/surfaces:surface_id",
-    "//mojo/services/public/interfaces/surfaces",
+    "//mojo/services/surfaces/public/interfaces",
+    "//mojo/services/surfaces/public/interfaces:surface_id",
   ]
 }