More build.xml updates, this is probably going to take a while.