The original patch got reverted because it broke `check-lldb` on a clean build. This fixes that. llvm-svn: 374201