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

Change-Id: I5c7ceff45dc212ec684d8a428db69b73341c56cb