Merge "Always log errno when aborting." am: 0c9ea17e0c
am: 002b30843b

Change-Id: I3f6e93ba637d66079cd6aae634ef7f392b32b73f