am fcaf4e9f: Merge "Revert "More pthreads cleanup.""

# Via Gerrit Code Review
* commit 'fcaf4e9f9b735e053469c7ecbf63584e10fd67a7':
  Revert "More pthreads cleanup."