Revert "Move mojo edk into mojo/edk"

mojo/system/channel.cc

Index: mojo/system/channel.cc
diff --git a/mojo/edk/system/channel.cc b/mojo/system/channel.cc
similarity index 98%
rename from mojo/edk/system/channel.cc
rename to mojo/system/channel.cc
index 79b6e92c638e44376c1126c38e456c3d7af8a0df..6c927bad3ca0b8ccd02c7800df6664c0ffca890d 100644
--- a/mojo/edk/system/channel.cc
+++ b/mojo/system/channel.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/system/channel.h"
+#include "mojo/system/channel.h"
 
 #include <algorithm>
 
@@ -11,9 +11,9 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/system/message_pipe_endpoint.h"
-#include "mojo/edk/system/transport_data.h"
+#include "mojo/embedder/platform_handle_vector.h"
+#include "mojo/system/message_pipe_endpoint.h"
+#include "mojo/system/transport_data.h"
 
 namespace mojo {
 namespace system {