Lint cleanups from William Rucklidge

Change-Id: Ia4756ef97e65837d55838ee0b30806a234565bfd
12 files changed