am 552d827f: am a6ad2e7e: am 42f11922: Merge "Pull in Windows compatibility header."

* commit '552d827f7e12e8b838c8f5c7e935ed2c9f1952f5':
  Pull in Windows compatibility header.