Merge "Fix x86 and x64 codegens for 8/16 stores."