Merge "Add some missing __noreturn attributes."