Post-push fix: Rerun clang-format over the code base, as clang-tidy
did not manage to reformat all relevant lines by itself.

Change-Id: Ifed235250709d793ceacfa12053b0dcfc98eafcd