Revert "Move mojo edk into mojo/edk"

mojo/embedder/platform_channel_utils_posix.h

Index: mojo/embedder/platform_channel_utils_posix.h
diff --git a/mojo/edk/embedder/platform_channel_utils_posix.h b/mojo/embedder/platform_channel_utils_posix.h
similarity index 92%
rename from mojo/edk/embedder/platform_channel_utils_posix.h
rename to mojo/embedder/platform_channel_utils_posix.h
index 87176fb1b957b9d1aad5a625bb50e3e68040ce76..094fe15d2214b3d55dffff32cc00e0362183c74b 100644
--- a/mojo/edk/embedder/platform_channel_utils_posix.h
+++ b/mojo/embedder/platform_channel_utils_posix.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_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_
-#define MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_
+#ifndef MOJO_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_
+#define MOJO_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_
 
 #include <stddef.h>
 #include <sys/types.h>  // For |ssize_t|.
@@ -11,8 +11,8 @@
 #include <deque>
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/system/system_impl_export.h"
 
 struct iovec;  // Declared in <sys/uio.h>.
 
@@ -73,4 +73,4 @@ MOJO_SYSTEM_IMPL_EXPORT ssize_t
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_