[todoxlf] android fixes