Merge "Fix Linux host checkbuilds."