Revert "Move mojo edk into mojo/edk"

mojo/services/view_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")
 
 # GYP version: mojo/mojo_services.gypi:mojo_view_manager
 shared_library("view_manager") {
   output_name = "mojo_view_manager"
 
@@ skipping 50 matching lines @@
   ]
 }
 
 # GYP version: mojo/mojo_services.gypi:mojo_view_manager_unittests
 test("mojo_view_manager_unittests") {
   deps = [
     "//base",
     "//base/test:test_support",
     "//mojo/application",
     "//mojo/application_manager",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
+    "//mojo/services/public/cpp/input_events",
     "//mojo/services/public/cpp/geometry",
-    "//mojo/services/public/cpp/input_events",
     "//mojo/services/public/cpp/view_manager",
     "//mojo/services/public/cpp/view_manager/lib:run_unittests",
     "//mojo/shell:test_support",
+    "//mojo/system",
     "//testing/gtest",
     "//ui/gfx/geometry",
   ]
 
   if (use_x11) {
     deps += ["//ui/gfx/x"]
   }
 
   if (is_component_build) {
     deps += ["//ui/gl"]
   }
 
   sources = [
     "test_change_tracker.cc",
     "test_change_tracker.h",
     "view_manager_unittest.cc",
   ]
 }