am 1e09b407: am 8cb3d855: am e09a766f: x86 mterp: fix cherry-pick/merge, issue 3095771

Merge commit '1e09b40718a6dc9db0ce34a7aacc93a3df45c664' into dalvik-dev

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