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

* commit '4868ec8cc28f3cf53c76dd998ba102e096faa1f6':
  Fix Windows SDK build.