am a2a9817f: am 85f491f9: Merge "More pthreads cleanup."

# Via Android Git Automerger (1) and others
* commit 'a2a9817f4c08d1f56d90f02ed13f531e8093f8e8':
  More pthreads cleanup.