Codestyle fixups to satisfy presubmits

This is a series of whitespace changes to align files created before
presubmit checks were enabled to match the presubmit checks that are
now in place on master.

Test: unit-tests
Change-Id: I52e769a3e7e6d390edfa067358a437f342e0e5d5
(cherry picked from commit 11d80256f35ba2995e88b129aaec9d8c7f302b7c)