Enable gating with flake8 on E121

Remove the ignore and fix the two minor violations of E121.

Change-Id: If9e3ef2c9994e50306e93394665a67d22c45566e
Merge "Enable gating with flake8 on E121"