Merge revisions r181919:183444 except for r182099, r182650, and r182683.


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