am 85f3e14b: Merge "bionic libc test: clean up pthread mutex type test"

* commit '85f3e14b0f9c30ed55e61a7909abe28128119520':
  bionic libc test: clean up pthread mutex type test