Record screenshots on failures on swarming bots.

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 99711722442a312ce6ce0a519f62a3275c0f5bf1..ff9e4777bd5d1c701fee120f9ae66735182f1d08 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -115,6 +115,9 @@ def AddCommonOptions(parser):
                      help='Path to save test_runner trace data to. This option '
                           'has been implemented for gtest, instrumentation '
                           'test and perf test.')
+  group.add_argument(

[jbudorick, 2017/03/01 20:19:21]

Why is this moving to the generic arguments when it's only supported for
instrumentation tests?

+      '--screenshot-directory', dest='screenshot_dir', type=os.path.realpath,
+      help='Capture screenshots of test failures')
 
   logcat_output_group = group.add_mutually_exclusive_group()
   logcat_output_group.add_argument(
@@ -286,9 +289,6 @@ def AddJavaTestOptions(argument_group):
       help=('Comma-separated list of annotations. Exclude tests with these '
             'annotations.'))
   argument_group.add_argument(
-      '--screenshot-directory', dest='screenshot_dir', type=os.path.realpath,
-      help='Capture screenshots of test failures')
-  argument_group.add_argument(
       '--save-perf-json', action='store_true',
       help='Saves the JSON file for each UI Perf test.')
   argument_group.add_argument(