Merge change I518925b0

* changes:
  Fix windows SDK build.