fix android breakage 

fix #7467
fix unused import for android after #7396 (f6a27cbd), #7451 (4f044891)