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

Change-Id: Id86e0c495bee494ecf9581d401a7110b3fe1ab15