(Reland) Add failure screenshots and images to results detail.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 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 all types of tests from one unified interface."""
 
 import argparse
 import collections
@@ skipping 145 matching lines @@
       help='Alias for: --verbose --num-retries=0 '
            '--enable-device-cache --enable-concurrent-adb '
            '--skip-clear-data --extract-test-list-from-filter')
 
   # TODO(jbudorick): Remove this once downstream bots have switched to
   # api.test_results.
   parser.add_argument(
       '--flakiness-dashboard-server',
       dest='flakiness_dashboard_server',
       help=argparse.SUPPRESS)
+  parser.add_argument(
+      '--gs-results-bucket',
+      help='Google Storage bucket to upload results to.')
+
 
   parser.add_argument(
       '--output-directory',
       dest='output_directory', type=os.path.realpath,
       help='Path to the directory in which build files are'
            ' located (must include build type). This will take'
            ' precedence over --debug and --release')
   parser.add_argument(
       '--repeat', '--gtest_repeat', '--gtest-repeat',
       dest='repeat', type=int, default=0,
@@ skipping 740 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())