Fix Mojo and Mandoline builds.

Fixes breaks from two recent CLs:
  https://codereview.chromium.org/1091513005
  https://codereview.chromium.org/1109943002

BUG=NONE
TEST=ToT builds mojo and mandoline.
R=sky@chromium.org
TBR=jam@chromium.org,ben@chromium.org

Review URL: https://codereview.chromium.org/1110823002

Cr-Commit-Position: refs/heads/master@{#327190}

components/kiosk_wm/merged_service_provider.h

@@ -6,10 +6,10 @@
 #define COMPONENTS_KIOSK_WM_MERGED_SERVICE_PROVIDER_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "mandoline/services/navigation/public/interfaces/navigation.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 #include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
-#include "third_party/mojo_services/src/navigation/public/interfaces/navigation.mojom.h"
 
 namespace kiosk_wm {
 

mandoline/app/desktop/launcher_process.cc

@@ -16,8 +16,8 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/trace_event/trace_event.h"
 #include "mandoline/app/desktop/launcher_process.h"
-#include "mojo/shell/context.h"
-#include "mojo/shell/switches.h"
+#include "mojo/runner/context.h"
+#include "mojo/runner/switches.h"
 
 namespace mandoline {
 namespace {

mandoline/app/desktop/main.cc

@@ -5,9 +5,9 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "mandoline/app/desktop/launcher_process.h"
-#include "mojo/shell/child_process.h"
-#include "mojo/shell/init.h"
-#include "mojo/shell/switches.h"
+#include "mojo/runner/child_process.h"
+#include "mojo/runner/init.h"
+#include "mojo/runner/switches.h"
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;

mandoline/services/navigation/public/interfaces/BUILD.gn

@@ -10,6 +10,8 @@ mojom("interfaces") {
     "navigation.mojom",
   ]
 
+  import_dirs = [ mojo_network_service_root ]
+
   deps = [
     "//mojo/services/network/public/interfaces",
   ]