Lint and other cleanups from William Rucklidge

Change-Id: I7fb23c2db85f0f121204560b79f1966f3d584431
13 files changed