Ant build file uses variable and reformatting

* Paths are stored in variable and the variables are used
* Removed the extra space in self-closing tags

Conflicts:
	build.xml