am 95060c89: Merge "Remove a glibc test."

* commit '95060c896455b6975733bd135bab61497000e7df':
  Remove a glibc test.