Convert remaining files to 4 space indent

Convert all the remaining files to a 4 space indent
to comply with PEP8 style rules.  ALso fixed up a few
other style issues that were recently introduced.

Bug: 28007659
Test: `python test_runner.py` passes.
Test: pylint passes.
Change-Id: I519246493407ca8cd4a7a5da84140a6e67618592
7 files changed