Revert "Move mojo edk into mojo/edk"

mojo/system/options_validation.h

Index: mojo/system/options_validation.h
diff --git a/mojo/edk/system/options_validation.h b/mojo/system/options_validation.h
similarity index 93%
rename from mojo/edk/system/options_validation.h
rename to mojo/system/options_validation.h
index 47725085bfbe3c7a395901663820f007a050b45c..25be7c0d518ffbd4b9cd15d33c34bab8a21443b1 100644
--- a/mojo/edk/system/options_validation.h
+++ b/mojo/system/options_validation.h
@@ -8,8 +8,8 @@
 // but any |flags| specified must be known to the system (otherwise, an error of
 // |MOJO_RESULT_UNIMPLEMENTED| should be returned).
 
-#ifndef MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_
-#define MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_
+#ifndef MOJO_SYSTEM_OPTIONS_VALIDATION_H_
+#define MOJO_SYSTEM_OPTIONS_VALIDATION_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -18,10 +18,10 @@
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -100,4 +100,4 @@ class UserOptionsReader {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_
+#endif  // MOJO_SYSTEM_OPTIONS_VALIDATION_H_