clang-format-6.0 bump fixes

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

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