Reformat bidforfix.xml and build.xml