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: Id2f976413b60262c099c28e786d22d417efc09d0