Merge "ART: Update invoke-custom implementation"