Fix checkstyle import ordering issues

Fix checkstyle import ordering issues. These have been introduced
by various commits, all in goog/master.

This fixes the ordering before I land unrelated changes.

Commits:
640f30a7763b0a4b80c767acb84c740aac04768b
782043caf81055aa1c331e9cc15b24a10e1bf17a
35cda39422acdeb3fa47ca60f131678e52dbfcb3
a38fbf63fd2a29884637a59387643c801ed4f663

Bug: 37984816
Test: make -j30 droid
Change-Id: I158dcf38c024a294d38cdb40f8909d5d5113b199
1 file changed