Merge "Add a 2 width option of clang format."