Merge "ART: Fix alloc-dealloc mismatch"
am: 22f75bb76d

Change-Id: I5833d30ee0d103a8131d337d4e18dd30d4a2aa10