Revert "Move mojo edk into mojo/edk"

mojo/system/platform_handle_dispatcher.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_PLATFORM_HANDLE_DISPATCHER_H_
-#define MOJO_EDK_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_
+#ifndef MOJO_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_
+#define MOJO_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_
 
 #include "base/macros.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/simple_dispatcher.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/simple_dispatcher.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
 
 // A dispatcher that simply wraps/transports a |PlatformHandle| (only for use by
 // the embedder).
 class MOJO_SYSTEM_IMPL_EXPORT PlatformHandleDispatcher
     : public SimpleDispatcher {
  public:
   explicit PlatformHandleDispatcher(
@@ skipping 29 matching lines @@
       embedder::PlatformHandleVector* platform_handles) override;
 
   embedder::ScopedPlatformHandle platform_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformHandleDispatcher);
 };
 
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_
+#endif  // MOJO_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_