Fix import order

Reorganize imports to make linter happy.

Test: m
Change-Id: If0e290cf9f2d12d8479848b6a74690412b673439
1 file changed