am e043761c: (-s ours) am c783e1a3: am 0fac7fd1: Merge "Leave the evidence lying around if an adb test fails."

* commit 'e043761c7abe5f40c272d945ea1a7f1b845225ee':