Enabled hacking checks H305 and H307

* H305  imports not grouped correctly
* H307  like imports should be grouped together

Change-Id: Ia4b376a90fed830ceea4b91caa920ff38263df5e
Merge "Enabled hacking checks H305 and H307"