Merge "Make it easier to generate helpers for mterp opcodes."
am: e0e835a448

Change-Id: I1d37b5f8d9487acd668b8323de71a3f334ebe743