Looks like we still have a few bots that are sad. Let try to get them fixed!

llvm-svn: 352835