am d5ec1ce9: am 3b0667c1: Merge "ART: Fix CFI annotation for art_quick_aput_obj"

* commit 'd5ec1ce96f8e444bb9bcd8b0a0a1a290fbf879bd':
  ART: Fix CFI annotation for art_quick_aput_obj