Merging r143869:

------------------------------------------------------------------------
r143869 | chandlerc | 2011-11-06 01:21:54 -0800 (Sun, 06 Nov 2011) | 2 lines

Switch some of these interfaces from std::string to StringRef and Twine.
This will facilitate further use and recombinations of them.
------------------------------------------------------------------------

llvm-svn: 143947