Revert "Move mojo edk into mojo/edk"

mojo/system/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.
 
 config("system_config") {
   defines = [
     # Ensures that dependent projects import the core functions on Windows.
     "MOJO_USE_SYSTEM_IMPL",
   ]
 }
 
 component("system") {
   output_name = "mojo_system_impl"
 
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
-    "//mojo/edk/embedder",
+    "//mojo/embedder",
   ]
 
   defines = [
     "MOJO_SYSTEM_IMPL_IMPLEMENTATION",
     "MOJO_SYSTEM_IMPLEMENTATION",
   ]
 
   all_dependent_configs = [ ":system_config" ]
 
   sources = [
@@ skipping 54 matching lines @@
     "waiter_list.cc",
     "waiter_list.h",
   ]
 }
 
 # GYP version: mojo/mojo_base.gyp:mojo_system_unittests
 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.h",
     "message_pipe_test_utils.cc",
-    "message_pipe_test_utils.h",
     "message_pipe_unittest.cc",
     "multiprocess_message_pipe_unittest.cc",
     "options_validation_unittest.cc",
     "platform_handle_dispatcher_unittest.cc",
     "raw_channel_unittest.cc",
     "remote_message_pipe_unittest.cc",
     "run_all_unittests.cc",
     "shared_buffer_dispatcher_unittest.cc",
     "simple_dispatcher_unittest.cc",
     "test_utils.cc",
     "test_utils.h",
     "waiter_list_unittest.cc",
     "waiter_test_utils.cc",
     "waiter_test_utils.h",
     "waiter_unittest.cc",
   ]
 }
 
 # GYP version: mojo/mojo_base.gyp:mojo_message_pipe_perftests
 test("mojo_message_pipe_perftests") {
   deps = [
     ":system",
     "//base",
     "//base/test:test_support",
     "//base/test:test_support_perf",
-    "//mojo/edk/test:test_support",
+    "//mojo/common/test:test_support",
     "//testing/gtest",
   ]
 
   sources = [
     "message_pipe_perftest.cc",
     "message_pipe_test_utils.h",
     "message_pipe_test_utils.cc",
     "test_utils.cc",
     "test_utils.h",
   ]
 }