Revert "Move mojo edk into mojo/edk"

mojo/embedder/BUILD.gn

Index: mojo/embedder/BUILD.gn
diff --git a/mojo/edk/embedder/BUILD.gn b/mojo/embedder/BUILD.gn
similarity index 89%
rename from mojo/edk/embedder/BUILD.gn
rename to mojo/embedder/BUILD.gn
index 9c2f39fdfb1ddcb054f624451b177bd8f0529aab..540cd832b73415a405bbe645f5b1a34d89fb10ee 100644
--- a/mojo/edk/embedder/BUILD.gn
+++ b/mojo/embedder/BUILD.gn
@@ -5,7 +5,7 @@
 source_set("embedder") {
   # This isn't really a standalone target, it must be linked into the
   # mojo_system_impl component.
-  visibility = [ "//mojo/edk/system" ]
+  visibility = [ "//mojo/system" ]
 
   deps = [ "//base", ]
 
@@ -14,7 +14,7 @@ source_set("embedder") {
     "MOJO_SYSTEM_IMPLEMENTATION",
   ]
 
-  configs += [ "//mojo/edk/system:system_config" ]
+  configs += [ "//mojo/system:system_config" ]
 
   sources = [
     "channel_init.cc",
@@ -53,13 +53,13 @@ source_set("embedder") {
 
 source_set("embedder_unittests") {
   testonly = true
-  visibility = [ "//mojo/edk/system:mojo_system_unittests" ]
+  visibility = [ "//mojo/system:mojo_system_unittests" ]
   testonly = true
 
   deps = [
     "//base",
-    "//mojo/edk/test:test_support",
-    "//mojo/edk/system",
+    "//mojo/common/test:test_support",
+    "//mojo/system",
     "//testing/gtest",
   ]