x86_64: finish biarch path fixup