Fixed some Lint warnings (and fixed some formattings).

This doesn't change functionality (didn't find anything broken here)

Bug:5964592

Change-Id: I7109c632096caafbf99434762dd1a690424058df
17 files changed