Track clang changes from r210764