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

Change-Id: I15315d43b6a771b57cbe48f129767dff79851e08