am 25ffaff6: am 86b12152: fix windows SDK build

Merge commit '25ffaff6b1eb8706a893cf255db123d0644b4a7d' into kraken

* commit '25ffaff6b1eb8706a893cf255db123d0644b4a7d':
  fix windows SDK build