Merge "Begin to restrict x86inc.asm usage"