Merge "Fix exit status of ART script tools/teardown-buildbot-device.sh." am: 11c0f3e15a
am: 87d8bade95

Change-Id: If339b33877455efa93214dfed88f7cfa4ed005d1