am c8924c6e: Merge "Use the original invoke type when inlining."

* commit 'c8924c6ea9e83ba3832dd5551df38ab06f4aaca9':
  Use the original invoke type when inlining.