Revert "Move mojo edk into mojo/edk"

mojo/system/message_pipe_test_utils.cc

Index: mojo/system/message_pipe_test_utils.cc
diff --git a/mojo/edk/system/message_pipe_test_utils.cc b/mojo/system/message_pipe_test_utils.cc
similarity index 94%
rename from mojo/edk/system/message_pipe_test_utils.cc
rename to mojo/system/message_pipe_test_utils.cc
index c773bf5dc9d22b866b42e6bf15eb849649532853..3c0a8ccd6f165f88dee0572460ca39233cb75fde 100644
--- a/mojo/edk/system/message_pipe_test_utils.cc
+++ b/mojo/system/message_pipe_test_utils.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/system/message_pipe_test_utils.h"
+#include "mojo/system/message_pipe_test_utils.h"
 
 #include "base/bind.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/waiter.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/waiter.h"
 
 namespace mojo {
 namespace system {