Merge "Revert "fdsan: make fatal by default."" am: c6c17ac1e8
am: 993434994e

Change-Id: I88fbcf48fce8b48ebcd9e471a587c46a29900d0a