android bb: Stop passing --build-dir and --build-output-dir.

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 multiprocessing
@@ skipping 294 matching lines @@
     build_number = str(options.build_properties.get('buildnumber', ''))
     results_link = '%s/%s/%s/layout-test-results/results.html' % (
         base, EscapeBuilderName(builder_name), build_number)
     bb_annotations.PrintLink('results', results_link)
     bb_annotations.PrintLink('(zip)', '%s/%s/%s/layout-test-results.zip' % (
         base, EscapeBuilderName(builder_name), build_number))
     gs_bucket = 'gs://chromium-layout-test-archives'
     RunCmd([os.path.join(SLAVE_SCRIPTS_DIR, 'chromium',
                          'archive_layout_test_results.py'),
             '--results-dir', '../../layout-test-results',
-            '--build-dir', CHROME_OUT_DIR,
             '--build-number', build_number,
             '--builder-name', builder_name,
             '--gs-bucket', gs_bucket],
             cwd=DIR_BUILD_ROOT)
 
 
 def _ParseLayoutTestResults(results):
   """Extract the failures from the test run."""
   # Cloned from third_party/WebKit/Tools/Scripts/print-json-test-results
   tests = _ConvertTrieToFlatPaths(results['tests'])
@@ skipping 279 matching lines @@
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   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))