Revert "Android: manually list test for multidex on all platforms."

This reverts commit 4a1125d8.

Reason for revert: Issue fixed elsewhere. See crbug.com/905230.

Original change's description:
> 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/1337493
> Reviewed-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}

TBR=mattcary@chromium.org,estevenson@chromium.org,jbudorick@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 905230, 906181
Change-Id: I029036b3b529cad6c3e84933ea1827484d2d02fc
Reviewed-on: https://chromium-review.googlesource.com/c/1340960
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608993}

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

@@ -11,6 +11,7 @@ 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;
@@ -191,7 +192,8 @@ public class BaseChromiumAndroidJUnitRunner extends AndroidJUnitRunner {
                     (DexFile[]) bootstrapClass.getDeclaredField("sIncrementalDexFiles").get(null));
         } catch (Exception e) {
             // Not an incremental apk.
-            if (BuildConfig.IS_MULTIDEX_ENABLED) {
+            if (BuildConfig.IS_MULTIDEX_ENABLED
+                    && Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
                 // Test listing fails for test classes that aren't in the main dex
                 // (crbug.com/903820).
                 addClassloaderDexFiles(dexFiles, getClass().getClassLoader());