Merge "clang-format the rest of the files" am: 1934619b8b
am: 50cd072d3b

Change-Id: Id328f17935b691a19cad3ab0846f7b7dba84eb4e