Merge "Remove mterp reliance on code item layout"
am: 7d86200335

Change-Id: I88faf8f272b661dd612415d76dae686da646f253