Merge lldb trunk r321017 to contrib/llvm/tools/lldb.
Merge lldb trunk r300422 and resolve conflicts.