Track clang changes from r209061