Merge "ART: Refactor mterp slightly"
am: 2a2cf2760a

Change-Id: Ic93fb6ec432a9525e8eed3a07ba143c7e4519839