Merge "Remove extraneous .clang-format files"