am da12e64f: am be8344bb: Merge "Modify tests for another glibc difference."

* commit 'da12e64f1770deee4f5d0b4c41d5530a98b21073':
  Modify tests for another glibc difference.