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

Change-Id: Id1fc01ed90e7ebce7e012c218f902b155277139f