Merge "ART: Fix CheckedCall" am: c19adea473
am: 09a9e10f88

Change-Id: Ib20c0c34b565f0030a8e50eb12f69c99b88fcacd