Revert "Move mojo edk into mojo/edk"

mojo/system/data_pipe.h

Index: mojo/system/data_pipe.h
diff --git a/mojo/edk/system/data_pipe.h b/mojo/system/data_pipe.h
similarity index 97%
rename from mojo/edk/system/data_pipe.h
rename to mojo/system/data_pipe.h
index 64b18e20a911d9377f20736ffbd5d182904c20a9..aa054dfa80547d3db7997e062ca82fe12f86bc4a 100644
--- a/mojo/edk/system/data_pipe.h
+++ b/mojo/system/data_pipe.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_DATA_PIPE_H_
-#define MOJO_EDK_SYSTEM_DATA_PIPE_H_
+#ifndef MOJO_SYSTEM_DATA_PIPE_H_
+#define MOJO_SYSTEM_DATA_PIPE_H_
 
 #include <stdint.h>
 
@@ -11,11 +11,11 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.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/public/c/system/data_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 {
 namespace system {
@@ -213,4 +213,4 @@ class MOJO_SYSTEM_IMPL_EXPORT DataPipe
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_DATA_PIPE_H_
+#endif  // MOJO_SYSTEM_DATA_PIPE_H_