The flakyness is no longer reproducible, and the tests seem to be passing reliably now. llvm-svn: 267704