Track clang changes from r200082
Track clang changes from r200082