Merge "Fix linker error with upstream llvm"