Revert "Move mojo edk into mojo/edk"

mojo/system/mapping_table.h

Index: mojo/system/mapping_table.h
diff --git a/mojo/edk/system/mapping_table.h b/mojo/system/mapping_table.h
similarity index 89%
rename from mojo/edk/system/mapping_table.h
rename to mojo/system/mapping_table.h
index d2812d8d2953e421856ea831cacd111083ca4ea0..5581e1eabfd8625d3ebac3558c59ac19d2a037d2 100644
--- a/mojo/edk/system/mapping_table.h
+++ b/mojo/system/mapping_table.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_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>
 
@@ -12,8 +12,8 @@
 #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 {
 
@@ -59,4 +59,4 @@ class MOJO_SYSTEM_IMPL_EXPORT MappingTable {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
+#endif  // MOJO_SYSTEM_MAPPING_TABLE_H_