am f2a5291d: Merge "Stop trying to guess whether we\'re using glibc when we already know."

* commit 'f2a5291d2c6f8eb956ddb303e972982059df3c78':
  Stop trying to guess whether we're using glibc when we already know.