Revert "Move mojo edk into mojo/edk"

mojo/system/simple_dispatcher.h

Index: mojo/system/simple_dispatcher.h
diff --git a/mojo/edk/system/simple_dispatcher.h b/mojo/system/simple_dispatcher.h
similarity index 83%
rename from mojo/edk/system/simple_dispatcher.h
rename to mojo/system/simple_dispatcher.h
index 400e3020e13f973fd9d345e2c36a5530f6ea4e19..f26f24c485d8dd223c065cc1ca4628f76fed9e41 100644
--- a/mojo/edk/system/simple_dispatcher.h
+++ b/mojo/system/simple_dispatcher.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_SIMPLE_DISPATCHER_H_
-#define MOJO_EDK_SYSTEM_SIMPLE_DISPATCHER_H_
+#ifndef MOJO_SYSTEM_SIMPLE_DISPATCHER_H_
+#define MOJO_SYSTEM_SIMPLE_DISPATCHER_H_
 
 #include <list>
 
 #include "base/macros.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/system_impl_export.h"
-#include "mojo/edk/system/waiter_list.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/system_impl_export.h"
+#include "mojo/system/waiter_list.h"
 
 namespace mojo {
 namespace system {
@@ -50,4 +50,4 @@ class MOJO_SYSTEM_IMPL_EXPORT SimpleDispatcher : public Dispatcher {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_SIMPLE_DISPATCHER_H_
+#endif  // MOJO_SYSTEM_SIMPLE_DISPATCHER_H_