[Android] Keep extracted secondary dex files when clearing data in tests. (RELAND)

base/BUILD.gn

 # Copyright (c) 2013 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.
 
 # HOW TO WRITE CONDITIONALS IN THIS FILE
 # ======================================
 #
 # In many other places, one would write a conditional that expresses all the
 # cases when a source file is used or unused, and then either add or subtract
 # it from the sources list in that case
@@ skipping 2566 matching lines @@
   }
 
   android_library("base_java_test_support") {
     testonly = true
     deps = [
       ":base_java",
       "//testing/android/reporter:reporter_java",
       "//third_party/android_support_test_runner:exposed_instrumentation_api_publish_java",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/android_tools:android_support_chromium_java",
+      "//third_party/android_tools:android_support_compat_java",
       "//third_party/hamcrest:hamcrest_core_java",
       "//third_party/junit",
     ]
     java_files = [
       "test/android/javatests/src/org/chromium/base/test/BaseActivityInstrumentationTestCase.java",
       "test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java",
       "test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java",
       "test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java",
       "test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java",
       "test/android/javatests/src/org/chromium/base/test/BaseChromiumRunnerCommon.java",
@@ skipping 93 matching lines @@
 }
 
 fuzzer_test("base_json_correctness_fuzzer") {
   sources = [
     "json/correctness_fuzzer.cc",
   ]
   deps = [
     ":base",
   ]
 }