Merge "ART: Fix 710-invoke-custom failure" am: 700ef3d1ad am: 82eeb53589
am: 7f584d9ad4

Change-Id: I0e3b499f851f2bc4d75155d9dd7575f0680f2d43