Merge "Revert "Fix the ART Buildbots using the master-art manifest.""