Merge "Shrink couple of x86 mterp handlers."
am: a52ac0cd73

Change-Id: I90382cd5904400d0a14a31c8ebce13649d8a5060