am 7998e6c5: am 4868ec8c: am a63b7d59: Merge "Fix Windows SDK build."

* commit '7998e6c50f94486d4ac9bb268d73a73c6eb5d592':
  Fix Windows SDK build.