Clean-up Lint errors

These are a bunch of random things the linter complains about.
Cleaning them up at once so that they don't polute other changes.

Bug: 341009477
Test: N/A
Change-Id: Iaab785b9b278af026417206066b9883469d30984