Revert "Move mojo edk into mojo/edk"

mojo/system/channel_unittest.cc

Index: mojo/system/channel_unittest.cc
diff --git a/mojo/edk/system/channel_unittest.cc b/mojo/system/channel_unittest.cc
similarity index 96%
rename from mojo/edk/system/channel_unittest.cc
rename to mojo/system/channel_unittest.cc
index 237c05cf22f7dd7aaa399a915a15b923556bb96f..a99663e1b5f3bd193077355806851b0f04cde7d6 100644
--- a/mojo/edk/system/channel_unittest.cc
+++ b/mojo/system/channel_unittest.cc
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/system/channel.h"
+#include "mojo/system/channel.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/test_io_thread.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/raw_channel.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/system/waiter.h"
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/raw_channel.h"
+#include "mojo/system/test_utils.h"
+#include "mojo/system/waiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {