Merge "Make sure we keep adb logs on buildbots."
am: 867a7c7330

* commit '867a7c7330b74d258878894364c9493bf803aace':
  Make sure we keep adb logs on buildbots.