Unsplit the MUS demo.

services/ui/demo/BUILD.gn

Index: services/ui/demo/BUILD.gn
diff --git a/services/ui/demo/BUILD.gn b/services/ui/demo/BUILD.gn
index 381a43110ba11f0e8dee3c4138381114806ee0ad..f06f81b2feb214f7b9e5cea52b306837c65c260c 100644
--- a/services/ui/demo/BUILD.gn
+++ b/services/ui/demo/BUILD.gn
@@ -6,26 +6,7 @@ import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 
-service("mus_demo") {
-  sources = [
-    "main.cc",
-    "mus_demo_service.cc",
-    "mus_demo_service.h",
-  ]
-
-  deps = [
-    ":mus_demo_lib",
-    "//mojo/public/cpp/bindings",
-    "//services/service_manager/public/cpp",
-    "//services/service_manager/public/cpp:sources",
-  ]
-
-  data_deps = [
-    ":manifest",
-  ]
-}
-
-static_library("mus_demo_lib") {
+source_set("lib") {
   sources = [
     "bitmap_uploader.cc",
     "bitmap_uploader.h",
@@ -34,6 +15,7 @@ static_library("mus_demo_lib") {
   ]
 
   public_deps = [
+    "//services/service_manager/public/cpp:sources",
     "//skia",
   ]
 
@@ -46,6 +28,16 @@ static_library("mus_demo_lib") {
     "//services/ui/public/interfaces",
     "//ui/gfx/geometry",
   ]
+}
+
+service("mus_demo") {
+  sources = [
+    "main.cc",
+  ]
+
+  deps = [
+    ":lib",
+  ]
 
   data_deps = [
     ":manifest",