Revert "Move mojo edk into mojo/edk"

mojo/system/BUILD.gn

Index: mojo/system/BUILD.gn
diff --git a/mojo/edk/system/BUILD.gn b/mojo/system/BUILD.gn
similarity index 94%
rename from mojo/edk/system/BUILD.gn
rename to mojo/system/BUILD.gn
index 549af7d8da3fd943756b11edc6d1ea69879eca54..4bee025b2450ce35b488fc08ffbbe98bf4f05b2a 100644
--- a/mojo/edk/system/BUILD.gn
+++ b/mojo/system/BUILD.gn
@@ -15,7 +15,7 @@ component("system") {
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
-    "//mojo/edk/embedder",
+    "//mojo/embedder",
   ]
 
   defines = [
@@ -90,24 +90,23 @@ test("mojo_system_unittests") {
   deps = [
     ":system",
     "//base",
-    "//mojo/edk/embedder:embedder_unittests",
-    "//mojo/edk/test:test_support",
+    "//mojo/common/test:test_support",
+    "//mojo/embedder:embedder_unittests",
     "//testing/gtest",
   ]
 
   sources = [
-    "../test/multiprocess_test_helper_unittest.cc",
     "channel_unittest.cc",
+    "core_unittest.cc",
     "core_test_base.cc",
     "core_test_base.h",
-    "core_unittest.cc",
     "data_pipe_unittest.cc",
     "dispatcher_unittest.cc",
     "local_data_pipe_unittest.cc",
     "memory_unittest.cc",
     "message_pipe_dispatcher_unittest.cc",
-    "message_pipe_test_utils.cc",
     "message_pipe_test_utils.h",
+    "message_pipe_test_utils.cc",
     "message_pipe_unittest.cc",
     "multiprocess_message_pipe_unittest.cc",
     "options_validation_unittest.cc",
@@ -133,7 +132,7 @@ test("mojo_message_pipe_perftests") {
     "//base",
     "//base/test:test_support",
     "//base/test:test_support_perf",
-    "//mojo/edk/test:test_support",
+    "//mojo/common/test:test_support",
     "//testing/gtest",
   ]