clang-format-6.0 bump fixes

The bump to use clang-format-6.0 now reports these issues.

Change-Id: I174c882727eaa9adf472599443a2f8ef637e2f0a
Signed-off-by: Patrick Venture <venture@google.com>
3 files changed