Lint cleanup from William Rucklidge.

Change-Id: I8d4a0aa3e264775d20e99a6b5265f3023de92560
5 files changed