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

* commit '016074f6beec46fa2140e2cabd11ade488776402':
  Avoid a system call in 'gettid'.