Revert "Move mojo edk into mojo/edk"

mojo/embedder/embedder_unittest.cc

Index: mojo/embedder/embedder_unittest.cc
diff --git a/mojo/edk/embedder/embedder_unittest.cc b/mojo/embedder/embedder_unittest.cc
similarity index 98%
rename from mojo/edk/embedder/embedder_unittest.cc
rename to mojo/embedder/embedder_unittest.cc
index 551ea27242ee3f49c2b8ac27b3b651454f2670e0..d41df96248a89d381814169eb8ce75ffd4c9c1bb 100644
--- a/mojo/edk/embedder/embedder_unittest.cc
+++ b/mojo/embedder/embedder_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 #include <string.h>
 
@@ -13,11 +13,11 @@
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_io_thread.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/test_embedder.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/test/multiprocess_test_helper.h"
+#include "mojo/common/test/multiprocess_test_helper.h"
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/test_embedder.h"
 #include "mojo/public/c/system/core.h"
+#include "mojo/system/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {