Merge "Fix x86 and x64 codegens for 8/16 stores."
am: 03ce1df8f9

Change-Id: I90f368bee3a1d061e20d71da4a3da1b3d3128bfc