Address some clang-tidy gripes.

Change-Id: I45b9570954c529feb618c9f7bf83f8f56802d3e0
Reviewed-on: https://code-review.googlesource.com/12250
Reviewed-by: Paul Wankadia <junyer@google.com>
6 files changed