Merge "Fix Arena allocation tracking." am: 4cb99a13d2 am: c50078606a am: 10a651b8dc
am: c0cc3cf7b8

Change-Id: I237250a975bd4ee8653651bbdb952ba64a7e4111