Revert "Move mojo edk into mojo/edk"

mojo/android/javatests/init_library.cc

 // 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.
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "mojo/android/javatests/mojo_test_case.h"
 #include "mojo/android/javatests/validation_test_util.h"
 #include "mojo/android/system/core_impl.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
+#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/simple_platform_support.h"
 
 namespace {
 
 base::android::RegistrationMethod kMojoRegisteredMethods[] = {
   { "CoreImpl", mojo::android::RegisterCoreImpl },
   { "MojoTestCase", mojo::android::RegisterMojoTestCase },
   { "ValidationTestUtil", mojo::android::RegisterValidationTestUtil },
 };
 
 bool RegisterMojoJni(JNIEnv* env) {
@@ skipping 14 matching lines @@
     return -1;
 
   if (!RegisterMojoJni(env))
     return -1;
 
   mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
       new mojo::embedder::SimplePlatformSupport()));
 
   return JNI_VERSION_1_4;
 }