Merge "Improve diagnostics in ART script tools/teardown-buildbot-device.sh." am: 3ebdf749 am: ae5b13d3 am: 25916259 Change-Id: I60f66f917d75c66cdb049236ce06107d935c2257