Restructure public side of surfaces service.

examples/bitmap_uploader/BUILD.gn

Index: examples/bitmap_uploader/BUILD.gn
diff --git a/examples/bitmap_uploader/BUILD.gn b/examples/bitmap_uploader/BUILD.gn
index 49a2581b2aaf407cc59a6efea9aa87e46468432e..8f6150ba5eacc572f8d9a4ed27d432009e6f2e70 100644
--- a/examples/bitmap_uploader/BUILD.gn
+++ b/examples/bitmap_uploader/BUILD.gn
@@ -12,17 +12,17 @@ source_set("bitmap_uploader") {
     "//base",
     "//mojo/public/c/gles2",
     "//mojo/services/public/interfaces/gpu",
-    "//mojo/services/public/interfaces/surfaces",
+    "//mojo/services/surfaces/public/interfaces",
   ]
   deps = [
     "//mojo/application",
     "//mojo/public/cpp/bindings:bindings",
     "//mojo/public/interfaces/application",
     "//mojo/services/public/cpp/geometry",
-    "//mojo/services/public/cpp/surfaces",
     "//mojo/services/public/interfaces/geometry",
     "//mojo/services/public/interfaces/input_events:input_events",
-    "//mojo/services/public/interfaces/surfaces:surface_id",
+    "//mojo/services/surfaces/public/cpp",
+    "//mojo/services/surfaces/public/interfaces:surface_id",
     "//mojo/services/view_manager/public/cpp",
     "//mojo/services/view_manager/public/interfaces",
     "//ui/gfx/geometry",