Update clang to trunk r290819 and resolve conflicts.
Update clang to release_39 branch r276489, and resolve conflicts.