Fix and enable E12 pep8 rule (indentation issues)

Change-Id: I500d2cacba09f2a4337ff325ae658f61b64e4b7a
Related-Bug: #1333290
Merge "Fix and enable E12 pep8 rule (indentation issues)"