am 0d87d351: Merge "Fix intrinsic asm entry/exit names."

* commit '0d87d351221e7cc854eefc96ddb08a345360409a':
  Fix intrinsic asm entry/exit names.