am 4d5d62f4: Merge "Make thread dumping more tolerant of broken invariants during abort."

* commit '4d5d62f404b164b697490d650ad8e82ad79a25f9':
  Make thread dumping more tolerant of broken invariants during abort.