Merge "ART: Let mterp know about invoke-custom"
am: 86a185601a

Change-Id: Ic1550323a42740a4756eff7e35fb671732b1c628