Merge "x86inc: fix compilation with NASM
 
 Change-Id: I5978921ab1ccad6648a5bde6ad023c3e3430f5f4
"