Fix compilation against 8.0.x
Update ant.xml