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

mojo/shell/BUILD.gn

Index: mojo/shell/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index 396b7b99a49a160f15893784f29b42c86d39fbef..54a2fbfecb18a7aabe59ef115ec5e9d30a985d74 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -2,9 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
 import("//build/config/ui.gni")
+import("//mojo/public/mojo.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 
+if (!use_prebuilt_mojo_shell) {
+
+# GYP version: mojo/mojo.gyp:mojo_shell
 executable("mojo_shell") {
   deps = [
     ":lib",
@@ -22,6 +26,8 @@ executable("mojo_shell") {
   ]
 }
 
+}  # !use_prebuilt_mojo_shell
+
 # GYP version: mojo/mojo.gyp:mojo_shell_lib
 source_set("lib") {
   deps = [
@@ -142,8 +148,8 @@ test("mojo_shell_tests") {
   ]
 
   datadeps = [
-    "//mojo/services/test_service:test_app",
-    "//mojo/services/test_service:test_request_tracker_app",
+    "//mojo/services/test_service:mojo_test_app",
+    "//mojo/services/test_service:mojo_test_request_tracker_app",
   ]
 
   sources = [