Merge "Update clang-tools build to clang-r468909"