Update hacking version and fix new violations

The newer hacking version is more strict about some things, so I
had to update a bunch of files with minor issues that previously
fell through the cracks.

Change-Id: I169bc6f8533bab28c7d6cf321ea83a8d7945f136
Updated from global requirements

Change-Id: Id2e9b922935a4c7ca4a1acfca45592e0b64bfb57
Merge "Updated from global requirements"