Revert "Move mojo edk into mojo/edk"

mojo/system/mapping_table.cc

 // 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.
 
-#include "mojo/edk/system/mapping_table.h"
+#include "mojo/system/mapping_table.h"
 
 #include "base/logging.h"
-#include "mojo/edk/embedder/platform_shared_buffer.h"
-#include "mojo/edk/system/constants.h"
+#include "mojo/embedder/platform_shared_buffer.h"
+#include "mojo/system/constants.h"
 
 namespace mojo {
 namespace system {
 
 MappingTable::MappingTable() {
 }
 
 MappingTable::~MappingTable() {
   // This should usually not be reached (the only instance should be owned by
   // the singleton |Core|, which lives forever), except in tests.
@@ skipping 18 matching lines @@
   if (it == address_to_mapping_map_.end())
     return MOJO_RESULT_INVALID_ARGUMENT;
   embedder::PlatformSharedBufferMapping* mapping_to_delete = it->second;
   address_to_mapping_map_.erase(it);
   delete mapping_to_delete;
   return MOJO_RESULT_OK;
 }
 
 }  // namespace system
 }  // namespace mojo