am 3130a32f: Merge "Fix win_sdk build."

* commit '3130a32fd910f424a9d6b811ed23d9a552004c81':
  Fix win_sdk build.