More updates for llvm-svn