Merge "Improve X86 handling of constants to Field/Array Set"