Revert "Remove 'mojo_' prefix from all mojo applications."

mojo/BUILD.gn

Index: mojo/BUILD.gn
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 9f032c8761bf3d66131c3aeb412995c7ed4492f9..9a997d8b91b2375add3becc204b2e60f0346c3aa 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
+import("//mojo/public/mojo.gni")
 
 group("mojo") {
   # Meta-target, don't link into production code.
@@ -16,10 +17,15 @@ group("mojo") {
     "//mojo/examples",
     "//mojo/public",
     "//mojo/services",
-    "//mojo/shell:mojo_shell",
     "//mojo/tools/package_manager",
   ]
 
+  if (use_prebuilt_mojo_shell) {
+    deps += [ "//mojo/public/tools:copy_mojo_shell" ]
+  } else {
+    deps += [ "//mojo/shell:mojo_shell" ]
+  }
+
   if (is_android) {
     deps += [
       "//mojo/android",
@@ -52,7 +58,7 @@ group("tests") {
     "//mojo/public/cpp/environment/tests:mojo_public_environment_unittests",
     "//mojo/public/cpp/system/tests:mojo_public_system_unittests",
     "//mojo/public/cpp/utility/tests:mojo_public_utility_unittests",
-    "//mojo/services/clipboard:clipboard_unittests",
+    "//mojo/services/clipboard:mojo_clipboard_unittests",
     "//mojo/services/network:unittests",
     "//mojo/shell:mojo_external_application_tests",
     "//mojo/shell:mojo_shell_tests",
@@ -62,8 +68,8 @@ group("tests") {
   if (use_aura) {
     deps += [
       "//mojo/services/public/cpp/view_manager/tests:mojo_view_manager_lib_unittests",
-      "//mojo/services/view_manager:view_manager_unittests",
-      "//mojo/services/window_manager:window_manager_unittests",
+      "//mojo/services/view_manager:mojo_view_manager_unittests",
+      "//mojo/services/window_manager:mojo_window_manager_unittests",
     ]
   }
 }