Merge "ART: invoke-custom support" am: 2a46b682b8 am: 0114a43563
am: 0af64f0682

Change-Id: I08bed3c56a606db6250e91e8dc4a0d9097e6d1ae