Revert "Move mojo edk into mojo/edk"

mojo/system/handle_signals_state.h

 // Copyright 2014 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_HANDLE_SIGNALS_STATE_H_
-#define MOJO_EDK_SYSTEM_HANDLE_SIGNALS_STATE_H_
+#ifndef MOJO_SYSTEM_HANDLE_SIGNALS_STATE_H_
+#define MOJO_SYSTEM_HANDLE_SIGNALS_STATE_H_
 
 #include "base/macros.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 {
 
 // Just "add" some constructors and methods to the C struct
 // |MojoHandleSignalsState| (for convenience). This should add no overhead.
 struct MOJO_SYSTEM_IMPL_EXPORT HandleSignalsState
     : public MojoHandleSignalsState {
   HandleSignalsState() {
     satisfied_signals = MOJO_HANDLE_SIGNAL_NONE;
@@ skipping 19 matching lines @@
   }
 
   // (Copy and assignment allowed.)
 };
 static_assert(sizeof(HandleSignalsState) == sizeof(MojoHandleSignalsState),
               "HandleSignalsState should add no overhead");
 
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_HANDLE_SIGNALS_STATE_H_
+#endif  // MOJO_SYSTEM_HANDLE_SIGNALS_STATE_H_