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

Change-Id: Ida2a58236d76c992d95f42bd16110776e9355492