Correct the order of import and remove unused definition

Test: atest
Change-Id: I60c409db5436a5ba9fffdee9df24158f15751658
1 file changed