Merge rename fix from libcxxabi (r169402: rename class with name that clashes with GCC 4.6/4.7) 

llvm-svn: 169515
1 file changed