Revert "Move mojo edk into mojo/edk"

mojo/system/proxy_message_pipe_endpoint.cc

 // 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.
 
-#include "mojo/edk/system/proxy_message_pipe_endpoint.h"
+#include "mojo/system/proxy_message_pipe_endpoint.h"
 
 #include <string.h>
 
 #include "base/logging.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/local_message_pipe_endpoint.h"
-#include "mojo/edk/system/message_pipe_dispatcher.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/local_message_pipe_endpoint.h"
+#include "mojo/system/message_pipe_dispatcher.h"
 
 namespace mojo {
 namespace system {
 
 ProxyMessagePipeEndpoint::ProxyMessagePipeEndpoint(
     ChannelEndpoint* channel_endpoint)
     : channel_endpoint_(channel_endpoint) {
 }
 
 ProxyMessagePipeEndpoint::~ProxyMessagePipeEndpoint() {
@@ skipping 25 matching lines @@
 
 void ProxyMessagePipeEndpoint::DetachIfNecessary() {
   if (channel_endpoint_.get()) {
     channel_endpoint_->DetachFromMessagePipe();
     channel_endpoint_ = nullptr;
   }
 }
 
 }  // namespace system
 }  // namespace mojo