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

* commit '4fbd0277aedd9cf1e81648e9a849c52211a65adf':
  Fix up failing glibc tests.