Revert "Move mojo edk into mojo/edk"

mojo/embedder/channel_init.cc

Index: mojo/embedder/channel_init.cc
diff --git a/mojo/edk/embedder/channel_init.cc b/mojo/embedder/channel_init.cc
similarity index 95%
rename from mojo/edk/embedder/channel_init.cc
rename to mojo/embedder/channel_init.cc
index 9ea984b57242180f39d1281c24d70aaf342ab051..4c15c83bfbe0a469971ecffc2fcbe2d68c685ee6 100644
--- a/mojo/edk/embedder/channel_init.cc
+++ b/mojo/embedder/channel_init.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/embedder/channel_init.h"
+#include "mojo/embedder/channel_init.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 namespace mojo {
 namespace embedder {