Merge "Remove extraneous .clang-format files"
am: 42a12f7b25

Change-Id: I5062d81a01cde71a9bbe7549f9e3c9198af955ae