Merge "Fix up failing glibc tests."