Lint cleanup from William Rucklidge.

Change-Id: I745810f5496a1b93263b20ff140f8883da61995e
6 files changed