Revert "Move mojo edk into mojo/edk"

mojo/embedder/test_embedder.cc

Index: mojo/embedder/test_embedder.cc
diff --git a/mojo/edk/embedder/test_embedder.cc b/mojo/embedder/test_embedder.cc
similarity index 83%
rename from mojo/edk/embedder/test_embedder.cc
rename to mojo/embedder/test_embedder.cc
index 95d3be6cdc888a43c83ca9a8843881d63b3d6d0c..6d93fef658dda5d5987ed0c440d399adf6df13ec 100644
--- a/mojo/edk/embedder/test_embedder.cc
+++ b/mojo/embedder/test_embedder.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/core.h"
-#include "mojo/edk/system/entrypoints.h"
-#include "mojo/edk/system/handle_table.h"
+#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/core.h"
+#include "mojo/system/entrypoints.h"
+#include "mojo/system/handle_table.h"
 
 namespace mojo {