Merge "Drop jobs for builder images from ci-management"