Revert "Move mojo edk into mojo/edk"

mojo/system/memory.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // 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>
 #include <string.h>  // For |memcpy()|.
 
 #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 {
 
 namespace internal {
 
 // Removes |const| from |T| (available as |remove_const<T>::type|):
 // TODO(vtl): Remove these once we have the C++11 |remove_const|.
 template <typename T>
 struct remove_const {
@@ skipping 341 matching lines @@
   UserPointer<Type> user_pointer_;
   size_t count_;
   scoped_ptr<Type[]> buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(UserPointerReaderWriter);
 };
 
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MEMORY_H_
+#endif  // MOJO_SYSTEM_MEMORY_H_