Revert "Move mojo edk into mojo/edk"

mojo/shell/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.
 
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//build/config/ui.gni")
 
 executable("mojo_shell") {
   deps = [
     ":lib",
@@ skipping 16 matching lines @@
   deps = [
     ":app_child_process_bindings",
     ":external_application_registrar_bindings",
     ":external_service_bindings",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//base:base_static",
     "//mojo/application",
     "//mojo/application_manager",
     "//mojo/common",
-    "//mojo/edk/system",
     "//mojo/gles2",
     "//mojo/public/interfaces/application",
     "//mojo/services/public/interfaces/network",
     "//mojo/spy",
+    "//mojo/system",
   ]
 
   sources = [
     "app_child_process.cc",
     "app_child_process.h",
     "app_child_process_host.cc",
     "app_child_process_host.h",
     "child_process.cc",
     "child_process.h",
     "child_process_host.cc",
@@ skipping 74 matching lines @@
 test("mojo_shell_tests") {
   deps = [
     ":lib",
     "//base",
     "//base:i18n",
     "//base/test:test_support",
     "//testing/gtest",
     "//net:test_support",
     "//url",
     "//mojo/application_manager",
+    "//mojo/services/test_service:bindings",
     "//mojo/common",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
-    "//mojo/services/test_service:bindings",
+    "//mojo/system",
   ]
 
   datadeps = [
     "//mojo/services/test_service:mojo_test_app",
     "//mojo/services/test_service:mojo_test_request_tracker_app",
   ]
 
   sources = [
     "child_process_host_unittest.cc",
     "dynamic_application_loader_unittest.cc",
@@ skipping 14 matching lines @@
 
 # GYP version: mojo/mojo.gyp:mojo_shell_test_support
 source_set("test_support") {
   sources = [
     "shell_test_helper.cc",
     "shell_test_helper.h",
   ]
 
   deps = [
     ":lib",
-    "//mojo/edk/system",
+    "//mojo/system",
   ]
 }
 
 # GYP version: mojo/mojo.gyp:external_application_tests
 test("mojo_external_application_tests") {
   deps = [
     ":lib",
     ":external_application_registrar_connection",
     "//base",
     "//base/test:test_support",
     "//testing/gtest",
     "//net:test_support",
     "//url",
     "//mojo/application_manager",
     "//mojo/common",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//mojo/system",
   ]
 
   sources = [
     "incoming_connection_listener_unittest.cc",
     "external_application_listener_unittest.cc",
     "external_application_test_main.cc",
   ]
 }