Plausible-looking fix for trunk llvm.

However it segfaults inside the enginer builder.
Further investigation required.
Merge branch 'master' of github.com:halide/Halide