Merge "Fix Arena allocation tracking."