Merge "tombstoned: don't generate tombstones for native backtraces." am: 11c7f43b90
am: 88413d74ef

Change-Id: I4528da468d1c8f28d4ca9b07c9201fdf9e258add