Merge "Remove mterp reliance on code item layout"