am ff50e75d: Merge "Fix pthread_t confusion."

* commit 'ff50e75d69b5cee253c213f91999e8f6f6129c58':
  Fix pthread_t confusion.