Update lldb to trunk r290819 and resolve conflicts.
Update LLDB snapshot to upstream r225923 (git 2b588ecd)Sponsored by: DARPA, AFRL