Jens says he was unhappy with the 80 cols limit, so clang-format was
explicitly avoided for these new files, but now that the both the config
and TEMPLATE.SOURCECODE.HEADER says 100, it's fine to reformat these to
enforce consistency from now on.

Change-Id: Ia6f0a65920ad2c9d7b0834a0712356568c39624e