Merge "ART: Fix call site resolution"
am: e29ccfd107

Change-Id: I6b3e6ebc0604895f62c714adaee421ebc9130b04