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

Change-Id: I079af2cfb749b7ffae5c4e1164a48e4313800a05