Merge "ART: Fix call site resolution"