Merge "ART: Fix CFI annotation for art_quick_aput_obj"