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

Change-Id: Ibe03350c9b64feeaba2b970cc2cbbf0e2cbdb1c8