Fix windows build path for llvm 3.5
Merge branch 'master' into llvm-trunk