Merge commit 'e09a766f' into gingerbread-plus-aosp * commit 'e09a766f': x86 mterp: fix cherry-pick/merge, issue 3095771