Merge "fault_handler: hopefully fix darwin build." am: 1f56cb5c59 am: b04c235e46 am: 94986fd1ed
am: 96fbfc2b76

Change-Id: I4375accf632be0e2c8a370c720e1d8808ab360e5