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

* commit 'b510802b5eb4af9d5da9b7f8d8c49cf5fa29928e':