Merge "Make sure we keep adb logs on buildbots."