Merge "Fix x86inc.asm to build PIC code correctly"