Use clang-format on more files.

Also fix some TODO comments.

Bug: None
Change-Id: Ia075ec1ccda16dbf388a1c4f37c4f0241892c4f6
4 files changed