Merge "Improve diagnostics in ART script tools/teardown-buildbot-device.sh." am: 3ebdf7495e
am: ae5b13d33b

Change-Id: Icec2410468fa94d735da7c2dd2611a8a46afbd01