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

Change-Id: I2117d09549eaab69e7e7ef4c5e1432f245312764