am 7ddeaf21: am 420b59fe: Fix windows SDK build.

Merge commit '7ddeaf2189847cbc6765af552c98439d654d6938'

* commit '7ddeaf2189847cbc6765af552c98439d654d6938':
  Fix windows SDK build.