Merge "fault_handler: hopefully fix darwin build."