am 353bb9c4: am 6ef04351: am 8076616c: Merge "Fix gettid() on Windows."

* commit '353bb9c47b0788dcc1df6c194d497732abf87d32':
  Fix gettid() on Windows.