Merge "Remove extraneous .clang-format files" am: 41c7bb5055 am: ef3017bdbd
am: a6df649958

Change-Id: I2fe255c5119e4fc152b10bf45b3adc6f952d8430