Update Windows build scripts for the recent build sys changes