Revert "Move mojo edk into mojo/edk"

mojo/system/waiter_test_utils.h

Index: mojo/system/waiter_test_utils.h
diff --git a/mojo/edk/system/waiter_test_utils.h b/mojo/system/waiter_test_utils.h
similarity index 92%
rename from mojo/edk/system/waiter_test_utils.h
rename to mojo/system/waiter_test_utils.h
index 25e5344fc6bac0a0e6191af5c3b0b5cdef9e507a..8de4c9d1ccb106cf6f75aa3005e2745434c6e871 100644
--- a/mojo/edk/system/waiter_test_utils.h
+++ b/mojo/system/waiter_test_utils.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_SYSTEM_WAITER_TEST_UTILS_H_
-#define MOJO_EDK_SYSTEM_WAITER_TEST_UTILS_H_
+#ifndef MOJO_SYSTEM_WAITER_TEST_UTILS_H_
+#define MOJO_SYSTEM_WAITER_TEST_UTILS_H_
 
 #include <stdint.h>
 
@@ -11,10 +11,10 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/simple_thread.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/waiter.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/waiter.h"
 
 namespace mojo {
 namespace system {
@@ -102,4 +102,4 @@ class WaiterThread : public base::SimpleThread {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_WAITER_TEST_UTILS_H_
+#endif  // MOJO_SYSTEM_WAITER_TEST_UTILS_H_