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

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