Revert "Move mojo edk into mojo/edk"

mojo/system/message_in_transit.h

Index: mojo/system/message_in_transit.h
diff --git a/mojo/edk/system/message_in_transit.h b/mojo/system/message_in_transit.h
similarity index 97%
rename from mojo/edk/system/message_in_transit.h
rename to mojo/system/message_in_transit.h
index 7714fa7e51802a0418e42c1b814495014c0229c8..9101f365a8cab4ed38e1c2de76d798189ffc8f21 100644
--- a/mojo/edk/system/message_in_transit.h
+++ b/mojo/system/message_in_transit.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_MESSAGE_IN_TRANSIT_H_
-#define MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_H_
+#ifndef MOJO_SYSTEM_MESSAGE_IN_TRANSIT_H_
+#define MOJO_SYSTEM_MESSAGE_IN_TRANSIT_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -13,9 +13,9 @@
 #include "base/macros.h"
 #include "base/memory/aligned_memory.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -264,4 +264,4 @@ class MOJO_SYSTEM_IMPL_EXPORT MessageInTransit {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_H_
+#endif  // MOJO_SYSTEM_MESSAGE_IN_TRANSIT_H_