am 04bb65e7: Merge "SDK: fix win-sdk build errors, make future errors fatal."

* commit '04bb65e7c4cd42ce50fa534807c973dba6cb2720':
  SDK: fix win-sdk build errors, make future errors fatal.