Fix various Pep8 1.5.4 errors

Pep8 1.5.4 fixes several bugs in visual indent and spaces
detection. Adjust the code accordingly so that it passes
once we try to upgrade.

Change-Id: I5691ffd29edcb32fdbacd9da7ca71bfcabeeffe5
Merge "Fix various Pep8 1.5.4 errors"