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

Change-Id: I98c12bf5de954447d6739b79bc480dab6de0ae19