[Android] Split uiautomator test runner from instrumentation.

build/android/run_uiautomator_tests.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Runs both the Python and Java UIAutomator tests."""
 
 import optparse
 import os
 import sys
 import time
 
 from pylib import buildbot_report
 from pylib import constants
 from pylib import ports
 from pylib.base import base_test_result
 from pylib.host_driven import run_python_tests
-from pylib.instrumentation import dispatch
+from pylib.uiautomator import dispatch
 from pylib.utils import report_results
 from pylib.utils import run_tests_helper
 from pylib.utils import test_options_parser
 
 
 def DispatchUIAutomatorTests(options):
   """Dispatches the UIAutomator tests, sharding if possible.
 
   Uses the logging module to print the combined final results and
   summary of the Java and Python tests. If the java_only option is set, only
@@ skipping 16 matching lines @@
 
   if options.run_java_tests:
     all_results.AddTestRunResults(dispatch.Dispatch(options))
   if options.run_python_tests:
     all_results.AddTestRunResults(run_python_tests.DispatchPythonTests(options))
 
   report_results.LogFull(
       results=all_results,
       test_type='UIAutomator',
       test_package=os.path.basename(options.test_jar),
-      annotation=options.annotation,
+      annotation=options.annotations,
       build_type=options.build_type,
       flakiness_server=options.flakiness_dashboard_server)
 
   return len(all_results.GetNotPass())
 
 
 def main(argv):
   option_parser = optparse.OptionParser()
   test_options_parser.AddUIAutomatorOptions(option_parser)
   options, args = option_parser.parse_args(argv)
   test_options_parser.ValidateUIAutomatorOptions(option_parser, options, args)
 
   run_tests_helper.SetLogLevel(options.verbose_count)
   ret = 1
   try:
     ret = DispatchUIAutomatorTests(options)
   finally:
     buildbot_report.PrintStepResultIfNeeded(options, ret)
   return ret
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))