[releng] restore build.ant; fix erlang compilation
Merge branch 'master' into pu