The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/09891bc02742f34a11a6d8ffd8993066f6c1b62c

commit 09891bc02742f34a11a6d8ffd8993066f6c1b62c
Author: hzl <hzl@google.com>
Date: Thu May 19 19:58:53 2016

Added the --screenshot option.

--screenshot option was broken for instrumentation tests. In this cl,
the option is enabled. With argument --screenshot, the device will take
a screenshot whenever an instrumentation test fails.

BUG= 611538 

Review-Url: https://codereview.chromium.org/1981043004
Cr-Commit-Position: refs/heads/master@{#394843}

[modify] https://crrev.com/09891bc02742f34a11a6d8ffd8993066f6c1b62c/build/android/pylib/instrumentation/instrumentation_test_instance.py
[modify] https://crrev.com/09891bc02742f34a11a6d8ffd8993066f6c1b62c/build/android/pylib/local/device/local_device_instrumentation_test_run.py
[modify] https://crrev.com/09891bc02742f34a11a6d8ffd8993066f6c1b62c/build/android/test_runner.py

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5a6fa1e0d268e6ef3f15aff3bb63fae8b94396cd

commit 5a6fa1e0d268e6ef3f15aff3bb63fae8b94396cd
Author: jbudorick <jbudorick@chromium.org>
Date: Fri May 20 01:40:41 2016

Revert of Added the --screenshot option. (patchset #7 id:120001 of https://codereview.chromium.org/1981043004/ )

Reason for revert:
breaks downstream

Original issue's description:
> Added the --screenshot option.
>
> --screenshot option was broken for instrumentation tests. In this cl,
> the option is enabled. With argument --screenshot, the device will take
> a screenshot whenever an instrumentation test fails.
>
> BUG= 611538 
>
> Committed: https://crrev.com/09891bc02742f34a11a6d8ffd8993066f6c1b62c
> Cr-Commit-Position: refs/heads/master@{#394843}

TBR=mikecase@chromium.org,hzl@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 611538 

Review-Url: https://codereview.chromium.org/1998903002
Cr-Commit-Position: refs/heads/master@{#394956}

[modify] https://crrev.com/5a6fa1e0d268e6ef3f15aff3bb63fae8b94396cd/build/android/pylib/instrumentation/instrumentation_test_instance.py
[modify] https://crrev.com/5a6fa1e0d268e6ef3f15aff3bb63fae8b94396cd/build/android/pylib/local/device/local_device_instrumentation_test_run.py
[modify] https://crrev.com/5a6fa1e0d268e6ef3f15aff3bb63fae8b94396cd/build/android/test_runner.py