am f602bf8e: Merge "Fix the glibc tests again."

* commit 'f602bf8e943d76a03d0739d79d831e640ed07df7':
  Fix the glibc tests again.