Merge "Fix Arena allocation tracking."
am: 4cb99a13d2

Change-Id: I4353655032f22837c55d4d221619126210b8aa47