Merge "Revert "Add debug dump if about to segfault"" into nyc-dev
am: 876c150be2

* commit '876c150be2164a20d3fc6da44f0e668e00960dda':
  Revert "Add debug dump if about to segfault"

Change-Id: Ibedf9b01990c6283cbb908b47acb41e93ace37dd