Revert "Move mojo edk into mojo/edk"

mojo/system/channel_endpoint.h

Index: mojo/system/channel_endpoint.h
diff --git a/mojo/edk/system/channel_endpoint.h b/mojo/system/channel_endpoint.h
similarity index 96%
rename from mojo/edk/system/channel_endpoint.h
rename to mojo/system/channel_endpoint.h
index 0ba7aaf65ddf73cf887de75c585a98fe9fc44294..d11c16ce9ffcf5ef37337ce66752c451e6f69c86 100644
--- a/mojo/edk/system/channel_endpoint.h
+++ b/mojo/system/channel_endpoint.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_
-#define MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_
+#ifndef MOJO_SYSTEM_CHANNEL_ENDPOINT_H_
+#define MOJO_SYSTEM_CHANNEL_ENDPOINT_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_in_transit_queue.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle_vector.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_in_transit_queue.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -207,4 +207,4 @@ class MOJO_SYSTEM_IMPL_EXPORT ChannelEndpoint
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_
+#endif  // MOJO_SYSTEM_CHANNEL_ENDPOINT_H_