Revert "Move mojo edk into mojo/edk"

mojo/system/core_unittest.cc

Index: mojo/system/core_unittest.cc
diff --git a/mojo/edk/system/core_unittest.cc b/mojo/system/core_unittest.cc
similarity index 99%
rename from mojo/edk/system/core_unittest.cc
rename to mojo/system/core_unittest.cc
index 9adde192bb40eeb71c8aaa8ee25f333d89783cf3..f229883a10c1b6990c93ab065655afd12e548b24 100644
--- a/mojo/edk/system/core_unittest.cc
+++ b/mojo/system/core_unittest.cc
@@ -2,7 +2,7 @@
 // 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.h"
+#include "mojo/system/core.h"
 
 #include <stdint.h>
 
@@ -10,7 +10,7 @@
 
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
-#include "mojo/edk/system/core_test_base.h"
+#include "mojo/system/core_test_base.h"
 
 namespace mojo {
 namespace system {