Merge "fault_handler: hopefully fix darwin build." am: 1f56cb5c59
am: b04c235e46

Change-Id: Ida7ba6f4aae320c099a26ebbbea1feac249c02e1