Revert "Move mojo edk into mojo/edk"

mojo/system/mapping_table.h

 // Copyright 2014 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_MAPPING_TABLE_H_
-#define MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
+#ifndef MOJO_SYSTEM_MAPPING_TABLE_H_
+#define MOJO_SYSTEM_MAPPING_TABLE_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 
 namespace embedder {
 class PlatformSharedBufferMapping;
 }
 
 namespace system {
 
 class Core;
@@ skipping 25 matching lines @@
   typedef base::hash_map<uintptr_t, embedder::PlatformSharedBufferMapping*>
       AddressToMappingMap;
   AddressToMappingMap address_to_mapping_map_;
 
   DISALLOW_COPY_AND_ASSIGN(MappingTable);
 };
 
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
+#endif  // MOJO_SYSTEM_MAPPING_TABLE_H_