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

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