This re-commits 13fe0386 after fixing a couple of issues in the LLDB testsuite in ef9bcace and 6b87d84f