Reformat files using Android-style imports.

Test: m ahat-test
Change-Id: Ib0eee0b7c414d85c245c7ef3163485cfa6ff34a4
4 files changed