Merge "Update Clang for 3.5 rebase (r209713)."