Update lld to trunk r290819 and resolve conflicts.
Bring lld (release_39 branch, r279477) to contrib