Merge "Add git-clang-format from r282136"