Support LLVM trunk after r204934 and zlib commits