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

# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'bfa199ab4019a7de9b95cd3db86c4d7176438803':
  Revert "More pthreads cleanup."