Merge "ART: Fix leak in Heap" am: 5b1157bf01
am: 6809e3404a

* commit '6809e3404a8ec5190f3dfcb1a2a029e87bd40c2a':
  ART: Fix leak in Heap