Lint cleanup from William Rucklidge.

Change-Id: Ifb36de18f95d521242d8853bb54024b09effb937
5 files changed