Merge "ART: Fix call site resolution" am: e29ccfd107 am: 45d6acc915
am: 48e59baccd

Change-Id: I418843c37e0c17b4c5a28b3f9823e8bcedb318e5