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

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