Revert r181703 as it is out of step with the llvm/release_33 branch.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/branches/release_33@182471 91177308-0d34-0410-b5e6-96231b3b80d8
Revert r181387 to fix the build, as lldb is out of step with the llvm/release_33 branch.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/branches/release_33@182472 91177308-0d34-0410-b5e6-96231b3b80d8