Merge "ART: Fix buildbot-build.sh"