Fix E131 PEP8 errors

Fixes files with the following error:

    E131 continuation line unaligned for hanging indent

and enables the check in tox.ini.

Also enables the E113 check (unexpected indentation) since it seems
that was fixed coincidentally with other previous changes.

Change-Id: I9270e5df257e12dc903689d8eb6fb03be01c034b
Merge "Fix E131 PEP8 errors"