am a8276f64: am 18368fc8: am f246c589: Merge "Clean up the pthread_create trampoline."

* commit 'a8276f64b203a01d1b393a11dc9c492d1a6557e3':
  Clean up the pthread_create trampoline.