fix Android according to recent changes