Update lldb to trunk r290819 and resolve conflicts.
Update lldb to release_39 branch r276489 and resolve immediate conflicts.