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

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