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

Change-Id: I1e92d3aea02ed7a4c47175b300d394aa8440a42a