Merge "ART: Fix two allocation/deallocation mismatches."