Merge "x86/x86-64: Fix cmpw() for 9-16 bit immediates."
am: 215fc3be80

Change-Id: Ic21c35e812722cfdcbfc2f239031a3c67f2e1b87