[Libguestfs] Always use an i686 guest for i[345]86 detected guest architecture

[Matthew Booth]

This fix wasn't actually complete, as the wrong architecture is still used in
the domain XML, which will result in failure to create a libvirt domain. This
change fixes it at source.