Revert "Move mojo edk into mojo/edk"

mojo/system/core_test_base.cc

Index: mojo/system/core_test_base.cc
diff --git a/mojo/edk/system/core_test_base.cc b/mojo/system/core_test_base.cc
similarity index 97%
rename from mojo/edk/system/core_test_base.cc
rename to mojo/system/core_test_base.cc
index 0f2c7cc9f4a2de0d677a4cd90e0b7e812696eaf4..05181351af48f6880bb61d1930d8def1adc07a57 100644
--- a/mojo/edk/system/core_test_base.cc
+++ b/mojo/system/core_test_base.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/system/core_test_base.h"
+#include "mojo/system/core_test_base.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/core.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/memory.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/core.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/memory.h"
 
 namespace mojo {
 namespace system {