Merge "Use the clang format 2 space as default."
am: 1252eba600

Change-Id: Ia83d9a096b66b5cea9be84bdc2ed35fdb09c8983