Merge "Fix incorrect relocations for x86."