Revert "Move mojo edk into mojo/edk"

media/mojo/services/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.
 
 # Things needed by multiple targets, like renderer_impl and renderer_app.
 # GYP version: media/media.gyp:media_mojo_lib
 source_set("lib") {
   deps = [
     "//base",
     "//media",
@@ skipping 59 matching lines @@
   sources = [
     "media_type_converters_unittest.cc",
   ]
 
   deps = [
     "//base",
     "//base/test:test_support",
     "//media",
     "//media/mojo/interfaces",
     "//mojo/common/test:run_all_unittests",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//mojo/system",
     "//testing/gtest",
     ":lib"
   ]
 }
 
 # GYP version: media/media.gyp:media_mojo_renderer_apptest
 # Not a 'test' because this is loaded via mojo_shell as an app.
 shared_library("renderer_apptest") {
   testonly = true
   output_name = "media_mojo_renderer_apptest"
@@ skipping 26 matching lines @@
   ]
 }
 
 group("tests") {
   testonly = true
   deps = [
     ":media_mojo_lib_unittests",
     ":renderer_apptest",
   ]
 }