xml: Use multiple passes in convert and merge script.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
17 files changed