Lint cleanup from William Rucklidge.

Change-Id: I8abcfd369f41b895ce746a21a35f250fe05c39d1
5 files changed