Fix Hacking rule H306 and H307

- H306: imports not in alphabetical order
- H307: like imports should be grouped together

Change-Id: Ib7f07bc72c2d1aa95267189c9c373af74854eaf5