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

* commit '6ef0435113c86e8e2986701727aa64ed6a1dc4c6':
  Fix gettid() on Windows.