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