Updated to LLVM/Clang revision 222533/222534