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

* commit '18368fc8e696c54adbd1537bf2d7c5c217210957':
  Clean up the pthread_create trampoline.