Merge "Reduce log limit for builder-* jobs"