Fix H307 violations and re-enable gating

H307 is a new rule in hacking 0.9, so fix new violations and
re-enable gating.

Change-Id: I805d10427ebeaee36589936f77a2cf0932c1378e
Merge "Fix H307 violations and re-enable gating"