Fix for trunk llvm
Merge branch 'master' of github.com:halide/Halide