Resolves all of the current linting issues

This PR goes through all of the files and looks for lint violations
and updates all of them.

Updated per-feedback

    Closes-Bug: 1398601

(cherry picked from commit 6389c643ee72a34be84edf5474b49a77a4d0fbb8)

Change-Id: Ibf67f0df529afd716478d31537befbf019a90b4d