MAPREDUCE-3377 on branch-1.0. Revert changes to build.xml that were wrongly included in r1306744, apparently by accident.