[Android] Set flags for uiautomator based on annotations not test name.

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
@@ skipping 34 matching lines @@
   all_results = base_test_result.TestRunResults()
 
   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.uiautomator_jar),
+      test_package=os.path.basename(options.test_jar),
       annotation=options.annotation,
       build_type=options.build_type,
       flakiness_server=options.flakiness_dashboard_server)
 
-  return len(all_results.GetAllBroken())
+  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))