Revert "Move mojo edk into mojo/edk"

content/app/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.
 
 content_app_sources = [
   "android/app_jni_registrar.cc",
   "android/app_jni_registrar.h",
   "android/child_process_service.cc",
   "android/child_process_service.h",
   "android/content_main.cc",
@@ skipping 34 matching lines @@
 
 if (is_ios) {
   content_app_sources -= [
     "content_main.cc",
     "mojo/mojo_init.cc",
     "mojo/mojo_init.h",
   ]
 } else {
   content_app_deps += [
     "//mojo/application_manager",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/interfaces/application",
+    "//mojo/system",
   ]
 }
 
 content_app_extra_configs = [
   "//build/config/compiler:wexit_time_destructors",
   "//content:content_implementation",
 ]
 
 # This includes the app sources for both the browser and child processes.
 source_set("both") {
@@ skipping 26 matching lines @@
   source_set("child") {
     visibility = [ "//content/public/app:child" ]
 
     sources = content_app_sources
     configs += content_app_extra_configs
     deps = content_app_deps
 
     defines += [ "CHROME_MULTIPLE_DLL_CHILD" ]
   }
 }