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

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index d07bb82c60a444bb36f0d7cb7452469d27c46ef7..87f4cecabd12bc3010bae8e26f3ca1ef22c1118d 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -175,6 +175,9 @@ def AddRemoteDeviceOptions(parser):
 def AddDeviceOptions(parser):
   """Adds device options to |parser|."""
   group = parser.add_argument_group(title='Device Options')
+  group.add_argument('-c', dest='cleanup_test_files',
+                     help='Cleanup test files on the device after run',
+                     action='store_true')
   group.add_argument('--tool',
                      dest='tool',
                      help=('Run the test under a tool '
@@ -369,6 +372,7 @@ def ProcessInstrumentationOptions(args):
   # TODO(jbudorick): Get rid of InstrumentationOptions.
   return instrumentation_test_options.InstrumentationOptions(
       args.tool,
+      args.cleanup_test_files,
       args.annotations,
       args.exclude_annotations,
       args.test_filter,
@@ -433,6 +437,7 @@ def ProcessUIAutomatorOptions(args):
 
   return uiautomator_test_options.UIAutomatorOptions(
       args.tool,
+      args.cleanup_test_files,
       args.annotations,
       args.exclude_annotations,
       args.test_filter,
@@ -631,6 +636,7 @@ def _RunGTests(args, devices):
     # into the gtest code.
     gtest_options = gtest_test_options.GTestOptions(
         args.tool,
+        args.cleanup_test_files,
         args.test_filter,
         args.run_disabled,
         args.test_arguments,