Update to match LLVM r222216