Merge "Fix check-all-builds script"