Revert "Move mojo edk into mojo/edk"

mojo/embedder/channel_init.h

Index: mojo/embedder/channel_init.h
diff --git a/mojo/edk/embedder/channel_init.h b/mojo/embedder/channel_init.h
similarity index 90%
rename from mojo/edk/embedder/channel_init.h
rename to mojo/embedder/channel_init.h
index 797cc6d492399c24b9d1855d860e38a4d91f66a5..26a645288f977bb5f94c66152fda626b7ef75015 100644
--- a/mojo/edk/embedder/channel_init.h
+++ b/mojo/embedder/channel_init.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_CHANNEL_INIT_H_
-#define MOJO_EDK_EMBEDDER_CHANNEL_INIT_H_
+#ifndef MOJO_EMBEDDER_CHANNEL_INIT_H_
+#define MOJO_EMBEDDER_CHANNEL_INIT_H_
 
 #include "base/files/file.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/cpp/system/core.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -60,4 +60,4 @@ class MOJO_SYSTEM_IMPL_EXPORT ChannelInit {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_CHANNEL_INIT_H_
+#endif  // MOJO_EMBEDDER_CHANNEL_INIT_H_