Fix ant/mvn build after rebasing.