Fix a lot of easy lint issues

Change-Id: I80b43dae137cbbb912ec0fcc4e401de16a9b44a1
20 files changed