Merge "ART: Add arena tracking mode"
am: aad63d0632

Change-Id: I738cb6ab4684a377116e103c94d4e236c4687a00