[android] Fixed renaming mess