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

* commit '10fa51baa71a25333f402c18b708fd9a4281d0e7':
  Make sure we keep adb logs on buildbots.