Merge "Fix intrinsic asm entry/exit names."