Merge "X86: Fix LoadString/Class for non-PIC boot image."