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

Change-Id: Id8a8abc00dfc1774d260fb9582cef35e77a4ca4a