Merge "ART: invoke-custom support"
am: 2a46b682b8

Change-Id: I39277974f529394b98c8adf8900f4fa9b40494e7