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

* commit 'a6ad2e7ed87e57b857b55e7256e64617e3d1faf0':
  Pull in Windows compatibility header.