Merge "Add a 2 width option of clang format."
am: 9a22ae5f57

Change-Id: Id8022fe0da3d6940d68b5fead2ee431f7065f9f9