Merge "ART: Fix allocation tracking"