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