Revert "Move mojo edk into mojo/edk"

mojo/system/dispatcher.h

Index: mojo/system/dispatcher.h
diff --git a/mojo/edk/system/dispatcher.h b/mojo/system/dispatcher.h
similarity index 98%
rename from mojo/edk/system/dispatcher.h
rename to mojo/system/dispatcher.h
index 3e2230a1b65da3b5d7b36a509e131ad37b6d76a5..9c5c3389e92aa71daa8b72a54e36665e5201a5ce 100644
--- a/mojo/edk/system/dispatcher.h
+++ b/mojo/system/dispatcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_DISPATCHER_H_
-#define MOJO_EDK_SYSTEM_DISPATCHER_H_
+#ifndef MOJO_SYSTEM_DISPATCHER_H_
+#define MOJO_SYSTEM_DISPATCHER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -14,15 +14,15 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle_vector.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 
@@ -402,4 +402,4 @@ class MOJO_SYSTEM_IMPL_EXPORT DispatcherTransport {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_DISPATCHER_H_
+#endif  // MOJO_SYSTEM_DISPATCHER_H_