Update from https://crrev.com/304418

build/android/buildbot/bb_device_steps.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.
 
 import collections
 import glob
 import hashlib
 import json
 import os
@@ skipping 106 matching lines @@
     args.append('--generate-json-file')
     args += ['-o', 'gtest-results/%s' % suite,
              '--annotate', 'gtest',
              '--build-number', str(options.build_properties.get('buildnumber',
                                                                 '')),
              '--builder-name', options.build_properties.get('buildername', '')]
   if options.target == 'Release':
     args += ['--target', 'Release']
   else:
     args += ['--target', 'Debug']
+  if options.flakiness_server:
+    args += ['--flakiness-dashboard-server=%s' %
+                options.flakiness_server]
   args += cmd
   RunCmd(args, cwd=DIR_BUILD_ROOT)
 
 
 def RunTestSuites(options, suites, suites_options=None):
   """Manages an invocation of test_runner.py for gtests.
 
   Args:
     options: options object.
     suites: List of suite names to run.
     suites_options: Command line options dictionary for particular suites.
                     For example,
                     {'content_browsertests', ['--num_retries=1', '--release']}
                     will add the options only to content_browsertests.
   """
 
   if not suites_options:
     suites_options = {}
 
   args = ['--verbose']
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   if options.gtest_filter:
     args.append('--gtest-filter=%s' % options.gtest_filter)
-  if options.flakiness_server:
-    args.append('--flakiness-dashboard-server=%s' %
-                options.flakiness_server)
 
   for suite in suites:
     bb_annotations.PrintNamedStep(suite)
     cmd = [suite] + args
     cmd += suites_options.get(suite, [])
     if suite == 'content_browsertests':
       cmd.append('--num_retries=1')
     _RunTest(options, cmd, suite)
 
 
@@ skipping 557 matching lines @@
 
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))