am e09a766f: x86 mterp: fix cherry-pick/merge, issue 3095771

Merge commit 'e09a766f3a964fb98296939ce1f92b8c95bf8c25' into gingerbread-plus-aosp

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