am b3ba9a83: am 29c9063a: Merge "Clean up the locks around Heap::VisitObjects()."

* commit 'b3ba9a8323e110332b31fe3af193eaff29e4f20e':
  Clean up the locks around Heap::VisitObjects().