am 987bd5c6: am 2deef73f: Merge "Avoid a system call in \'gettid\'."

* commit '987bd5c64f1381185f27afb60ec46be5e9eaba36':
  Avoid a system call in 'gettid'.