Lint cleanup from William Rucklidge.

Change-Id: Ie0e0aa58440be7a4f67dcd633dbb6f1bb0c051a8
9 files changed