[DF-5352] android-specific code surrounded by ifdef