Change to non android deps