Revert "Move mojo edk into mojo/edk"

mojo/system/waiter.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // 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 {
 
 // IMPORTANT (all-caps gets your attention, right?): |Waiter| methods are called
 // under other locks, in particular, |Dispatcher::lock_|s, so |Waiter| methods
 // must never call out to other objects (in particular, |Dispatcher|s). This
 // class is thread-safe.
 class MOJO_SYSTEM_IMPL_EXPORT Waiter {
  public:
@@ skipping 46 matching lines @@
   // |MojoWaitMany()|). But in tests, it's convenient to use this for other
   // purposes (e.g., to distinguish between different wake-up reasons).
   uint32_t awake_context_;
 
   DISALLOW_COPY_AND_ASSIGN(Waiter);
 };
 
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_WAITER_H_
+#endif  // MOJO_SYSTEM_WAITER_H_