Windows build fixes
Merge branch 'master' of https://github.com/Halide/halide