[Android] Add --logcat-output-file option.

This option will make it much easier to add logcats to
individual steps in recipes.

BUG=583798

Review URL: https://codereview.chromium.org/1663933003

Cr-Commit-Position: refs/heads/master@{#374295}
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index e16acbf..fd701f9 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -109,9 +109,16 @@
                      dest='json_results_file',
                      help='If set, will dump results in JSON form '
                           'to specified file.')
-  group.add_argument('--logcat-output-dir',
-                     help='If set, will dump logcats recorded during test run '
-                          'to directory. File names will be the device ids.')
+
+  logcat_output_group = group.add_mutually_exclusive_group()
+  logcat_output_group.add_argument(
+      '--logcat-output-dir',
+      help='If set, will dump logcats recorded during test run to directory. '
+           'File names will be the device ids with timestamps.')
+  logcat_output_group.add_argument(
+      '--logcat-output-file',
+      help='If set, will merge logcats recorded during test run and dump them '
+           'to the specified file.')
 
 def ProcessCommonOptions(args):
   """Processes and handles all common options."""