Android: manually list test for multidex on all platforms.

This small change removes the KitKat restriction for manual
listing of tests.

Bug: 905230
Change-Id: Ib66544873017fd0c5261af0ad1d57358ea97a167
Reviewed-on: https://chromium-review.googlesource.com/c/1337493Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Matthew Cary <mattcary@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608446}

base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java

@@ -11,7 +11,6 @@ import android.content.Context;
 import android.content.pm.InstrumentationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.internal.runner.RunnerArgs;
@@ -192,8 +191,7 @@ public class BaseChromiumAndroidJUnitRunner extends AndroidJUnitRunner {
                     (DexFile[]) bootstrapClass.getDeclaredField("sIncrementalDexFiles").get(null));
         } catch (Exception e) {
             // Not an incremental apk.
-            if (BuildConfig.IS_MULTIDEX_ENABLED
-                    && Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
+            if (BuildConfig.IS_MULTIDEX_ENABLED) {
                 // Test listing fails for test classes that aren't in the main dex
                 // (crbug.com/903820).
                 addClassloaderDexFiles(dexFiles, getClass().getClassLoader());