[Android] Fix the uiautomator test runner's use of InstrumentationOptions.

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
@@ skipping 21 matching lines @@
         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,
         test_apk_jar_path=None,
+        test_runner=None,
         test_support_apk_path=None)
     super(TestRunner, self).__init__(instrumentation_options, device,
                                      shard_index, test_pkg)
 
     cmdline_file = constants.PACKAGE_INFO[test_options.package].cmdline_file
     self.flags = None
     if cmdline_file:
       self.flags = flag_changer.FlagChanger(self.device, cmdline_file)
     self._package = constants.PACKAGE_INFO[test_options.package].package
     self._activity = constants.PACKAGE_INFO[test_options.package].activity
@@ skipping 15 matching lines @@
       else:
         self.flags.AddFlags(['--disable-fre'])
     self.device.StartActivity(
         intent.Intent(action='android.intent.action.MAIN',
                       activity=self._activity,
                       package=self._package),
         blocking=True,
         force_stop=True)
     return self.device.old_interface.RunUIAutomatorTest(
         test, self.test_pkg.GetPackageName(), timeout)