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

Merge commit 'fd9c61b2e56a4bb73ffd03d13504461e51a3611b' into dalvik-dev

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