Merge "ART: Fix return-object verification"