Revert "Move mojo edk into mojo/edk"

mojo/services/window_manager/BUILD.gn

 # 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.
 
 import("//build/config/ui.gni")
 
 if (use_aura) {
 
 # GYP version: mojo/mojo_services.gypi:mojo_core_window_manager
 shared_library("window_manager") {
@@ skipping 45 matching lines @@
 # GYP version: mojo/mojo_services.gypi:mojo_core_window_manager_unittests
 test("mojo_core_window_manager_unittests") {
   sources = [
     "window_manager_api_unittest.cc",
     "window_manager_unittests.cc",
   ]
 
   deps = [
     "//base/test:test_support",
     "//mojo/application_manager",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/services/public/cpp/view_manager",
     "//mojo/services/public/interfaces/view_manager",
     "//mojo/services/public/interfaces/window_manager",
     "//mojo/shell:test_support",
+    "//mojo/system",
     "//testing/gtest",
     "//ui/gl",
   ]
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
   }
 }
 
 }  # use_aura