[Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND)

testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java

 // Copyright 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.
 
 package org.chromium.native_test;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Process;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.multidex.ChromiumMultiDexInstaller;
 import org.chromium.test.reporter.TestStatusReporter;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
 
 /**
  *  Android's NativeActivity is mostly useful for pure-native code.
  *  Our tests need to go up to our own java classes, which is not possible using
  *  the native activity class loader.
@@ skipping 15 matching lines @@
 
     private String mCommandLineFilePath;
     private StringBuilder mCommandLineFlags = new StringBuilder();
     private TestStatusReporter mReporter;
     private boolean mRunInSubThread = false;
     private boolean mStdoutFifo = false;
     private String mStdoutFilePath;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        ChromiumMultiDexInstaller.install(this);
         super.onCreate(savedInstanceState);
+
         CommandLine.init(new String[]{});
 
         parseArgumentsFromIntent(getIntent());
         mReporter = new TestStatusReporter(this);
     }
 
     private void parseArgumentsFromIntent(Intent intent) {
         Log.i(TAG, "Extras:");
         Bundle extras = intent.getExtras();
         if (extras != null) {
@@ skipping 78 matching lines @@
     // Signal a failure of the native test loader to python scripts
     // which run tests.  For example, we look for
     // RUNNER_FAILED build/android/test_package.py.
     private void nativeTestFailed() {
         Log.e(TAG, "[ RUNNER_FAILED ] could not load native library");
     }
 
     private native void nativeRunTests(String commandLineFlags, String commandLineFilePath,
             String stdoutFilePath, boolean stdoutFifo, Context appContext);
 }