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:640f30a776782043caf835cda39422a38fbf63fdBug: 37984816 Test: make -j30 droid Change-Id: I158dcf38c024a294d38cdb40f8909d5d5113b199