am 64328f3a: am c783e1a3: am 0fac7fd1: Merge "Leave the evidence lying around if an adb test fails."

* commit '64328f3a72f18f48a7bd9b71931e555103069875':
  Leave the evidence lying around if an adb test fails.