Merge "Catch signals that happen inside a fault handler."
am: fe102795cf

Change-Id: I7be8faa3175f087ae6045b724634f26fc32701b4