Merge "Revert "Fix incorrect relocations for x86.""