Merge "Fix checkbuild on Mac builders."