am f084f7dc: Merge "Fix up failing glibc tests."

* commit 'f084f7dc1e4601f96c44eeb422615d7ac742b2d0':
  Fix up failing glibc tests.