Merge "Use ENTRY/END in custom x86 assembler too."