Commit missing fixes for tool_file_rename

llvm-svn: 314051
4 files changed