backports build.xml improvement