Fix style errors close to new hacking update

This patch fix a bunch of errors which will arrive after we
will start use new hacking version.

Change-Id: I49721f1ba9f3f017da00212a9fdc5b87d5afaedf
Closes-Bug: #1330536
Merge "Fix style errors close to new hacking update"