Adds support for mojo apps to live in their own directory

mojo/runner/shell_test_base_android.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 "mojo/runner/shell_test_base.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "jni/ShellTestBase_jni.h"
-#include "mojo/runner/filename_util.h"
+#include "mojo/util/filename_util.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace shell {
 namespace test {
 
 namespace {
 
 JNIEnv* InitEnv() {
   JNIEnv* env = base::android::AttachCurrentThread();
@@ skipping 15 matching lines @@
       Java_ShellTestBase_extractMojoApplications(
           env, base::android::GetApplicationContext()));
   shell_context_.url_resolver()->SetMojoBaseURL(
       FilePathToFileURL(base::FilePath(
           base::android::ConvertJavaStringToUTF8(env, service_dir.obj()))));
 }
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo