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