Merge ^/vendor/lldb/dist up to its last change, and resolve conflicts.