More lint cleanup.

Change-Id: I74f586ac357df055e944f359463562197db79f1d
2 files changed