Merge "ART: Fix build for counting arena allocations."