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

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