Merge "Add tool prebuilt for builder-0.6.1""