Fix commandline and disabling tests for apk based tests.

testing/android/native_test_launcher.cc

 // Copyright (c) 2012 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 <stdio.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/path_utils.h"
 #include "base/at_exit.h"
@@ skipping 110 matching lines @@
 
 void LibraryLoadedOnMainThread(JNIEnv* env) {
   static const char* const kInitialArgv[] = { "ChromeTestActivity" };
 
   {
     // We need a test suite to be created before we do any tracing or
     // logging: it creates a global at_exit_manager and initializes
     // internal gtest data structures based on the command line.
     // It needs to be scoped as it also resets the CommandLine.
     std::vector<std::string> args;
-    FilePath path("/data/user/0/org.chromium.native_tests/files/");
+    FilePath path("/data/user/0/org.chromium.native_test/files/");
     ParseArgsFromCommandLineFile(path, &args);
     std::vector<char*> argv;
     ArgsToArgv(args, &argv);
     base::TestSuite test_suite(argv.size(), &argv[0]);
   }
 
   CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
 
   logging::InitLogging(NULL,
                        logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
@@ skipping 39 matching lines @@
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!RegisterNativesImpl(env)) {
     return -1;
   }
   LibraryLoadedOnMainThread(env);
   return JNI_VERSION_1_4;
 }