am d3f2a204: am 7a5732bd: Merge "Add some missing __noreturn attributes."

* commit 'd3f2a204b7faa52b086c85736aa2449d8a83c547':
  Add some missing __noreturn attributes.