Merge "ART: Fix allocation tracking"
am: 64a8b85242

Change-Id: Ic732cbf76c65f831995c9c868b4bd372f4f1c732