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

Change-Id: Idb79004ca14a9023d9e54a6d944aa266f5f779a3