Fix arch cross-build when running distro cross-build.
Fix arch cross-build when running distro cross-build.

Corner case existed when building a cross-arch container (i686 on x86_64)
on a cross-distro host (Fedora container on Ubuntu host).  Fixed the
arch "fixup" code to do the right thing when running from the bootstrap.

Signed-off-by: Michael H. Warfield <9ca8624b354671dd898baa30d05f83fa7ac377ba@WittsEnd.com>
Acked-by: Stéphane Graber <089afc6d81f66f1168a9849e15660feae286e024@ubuntu.com>

ojkastl/lxc_Patches,ojkastl/lxc_Patches,ojkastl/lxc_Patches,ojkastl/lxc_Patches