Revert "Move mojo edk into mojo/edk"

mojo/system/memory.h

Index: mojo/system/memory.h
diff --git a/mojo/edk/system/memory.h b/mojo/system/memory.h
similarity index 98%
rename from mojo/edk/system/memory.h
rename to mojo/system/memory.h
index 7b5b724fa2135dc02525af99d3a974c84ed54120..acbbb5421b94177f373b7ca959102a90806b24c3 100644
--- a/mojo/edk/system/memory.h
+++ b/mojo/system/memory.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_MEMORY_H_
-#define MOJO_EDK_SYSTEM_MEMORY_H_
+#ifndef MOJO_SYSTEM_MEMORY_H_
+#define MOJO_SYSTEM_MEMORY_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -11,8 +11,8 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/macros.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -374,4 +374,4 @@ class UserPointerReaderWriter {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MEMORY_H_
+#endif  // MOJO_SYSTEM_MEMORY_H_