Fix new pep8 checks so we can get the new hacking package

Change-Id: I41ba51ce6b3ac61b5af0fb02b8fb86285d20eba6