Merge "Simplify the ART Buildbot clean-up script regarding chroot support."
am: 36e18dca7b

Change-Id: I9d001071c435df98bb34704201b5029b8fea8dae