Merge "Use the clang format 2 space as default." am: 1252eba600 am: 880f129d36
am: 68f84e9210

Change-Id: I21dfc0774c923e06e0ae0f18c3d6744d1fb8f5c4