Merge "Fix build break on glibc hosts."