Merge "Fix non-Linux builds."