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

Change-Id: Idef0e5af5935cc5fe73540d4c1a3ff20af1ab428