Revert "Move mojo edk into mojo/edk"

mojo/system/waiter.h

Index: mojo/system/waiter.h
diff --git a/mojo/edk/system/waiter.h b/mojo/system/waiter.h
similarity index 95%
rename from mojo/edk/system/waiter.h
rename to mojo/system/waiter.h
index 03ada1664302e406c9b226c22b39d628f6b72cb3..af85e9c5891606e5bb36df7122b399e13695b259 100644
--- a/mojo/edk/system/waiter.h
+++ b/mojo/system/waiter.h
@@ -2,16 +2,16 @@
 // 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_H_
-#define MOJO_EDK_SYSTEM_WAITER_H_
+#ifndef MOJO_SYSTEM_WAITER_H_
+#define MOJO_SYSTEM_WAITER_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -78,4 +78,4 @@ class MOJO_SYSTEM_IMPL_EXPORT Waiter {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_WAITER_H_
+#endif  // MOJO_SYSTEM_WAITER_H_