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

Change-Id: I9ef55964245472afd412ae0720651bc2fdcdc2e0