Revert "Move mojo edk into mojo/edk"

mojo/shell/BUILD.gn

Index: mojo/shell/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index f405bc9d2f41a5bcf46bf9ccb4f97175d73fa281..becbf1551c8b671e550c63a629865b8236fb16ba 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -34,11 +34,11 @@ source_set("lib") {
     "//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 = [
@@ -133,10 +133,10 @@ test("mojo_shell_tests") {
     "//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 = [
@@ -171,7 +171,7 @@ source_set("test_support") {
 
   deps = [
     ":lib",
-    "//mojo/edk/system",
+    "//mojo/system",
   ]
 }
 
@@ -187,8 +187,8 @@ test("mojo_external_application_tests") {
     "//url",
     "//mojo/application_manager",
     "//mojo/common",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//mojo/system",
   ]
 
   sources = [