Merge "ART: Fix alloc-dealloc mismatch"