Revert of [Android] Reland cleanup of old_interface in build/android/pylib.

build/android/pylib/uiautomator/test_runner.py

 # 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.
 
 """Class for running uiautomator tests on a single device."""
 
 from pylib import constants
 from pylib import flag_changer
 from pylib.device import intent
 from pylib.instrumentation import test_options as instr_test_options
 from pylib.instrumentation import test_runner as instr_test_runner
 
 
 class TestRunner(instr_test_runner.TestRunner):
   """Responsible for running a series of tests connected to a single device."""
 
   def __init__(self, test_options, device, shard_index, test_pkg):
     """Create a new TestRunner.
 
     Args:
       test_options: A UIAutomatorOptions object.
       device: Attached android device.
       shard_index: Shard index.
       test_pkg: A TestPackage object.
     """
     # Create an InstrumentationOptions object to pass to the super class
     instrumentation_options = instr_test_options.InstrumentationOptions(
         test_options.tool,
+        test_options.cleanup_test_files,
         test_options.annotations,
         test_options.exclude_annotations,
         test_options.test_filter,
         test_options.test_data,
         test_options.save_perf_json,
         test_options.screenshot_failures,
         wait_for_debugger=False,
         coverage_dir=None,
         test_apk=None,
         test_apk_path=None,
@@ skipping 40 matching lines @@
 
   #override
   def _GenerateTestResult(self, test, _result_code, _result_bundle, statuses,
                           start_ms, duration_ms):
     # uiautomator emits its summary status with INSTRUMENTATION_STATUS_CODE,
     # not INSTRUMENTATION_CODE, so we have to drop if off the list of statuses.
     summary_code, summary_bundle = statuses[-1]
     return super(TestRunner, self)._GenerateTestResult(
         test, summary_code, summary_bundle, statuses[:-1], start_ms,
         duration_ms)