am ef1ed3c5: (-s ours) x86 mterp: fix cherry-pick/merge, issue 3095771

Merge commit 'ef1ed3c5cbde4de64e1991de2dbea57efd964841'

* commit 'ef1ed3c5cbde4de64e1991de2dbea57efd964841':
  x86 mterp: fix cherry-pick/merge, issue 3095771