Revert "Move mojo edk into mojo/edk"

mojo/system/data_pipe_consumer_dispatcher.h

Index: mojo/system/data_pipe_consumer_dispatcher.h
diff --git a/mojo/edk/system/data_pipe_consumer_dispatcher.h b/mojo/system/data_pipe_consumer_dispatcher.h
similarity index 88%
rename from mojo/edk/system/data_pipe_consumer_dispatcher.h
rename to mojo/system/data_pipe_consumer_dispatcher.h
index 59c123946171d5613b48a1f66b28af477a6c63ff..64e5bb3cb8cf321375226be116ec0478e770f496 100644
--- a/mojo/edk/system/data_pipe_consumer_dispatcher.h
+++ b/mojo/system/data_pipe_consumer_dispatcher.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
-#define MOJO_EDK_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
+#ifndef MOJO_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
+#define MOJO_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -64,4 +64,4 @@ class MOJO_SYSTEM_IMPL_EXPORT DataPipeConsumerDispatcher : public Dispatcher {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
+#endif  // MOJO_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_