Handle segfaults while walking native heap am: ba5d9ff6d9
am: 5a964afd56

* commit '5a964afd567d3ed33636e88386cd11332ea617c2':
  Handle segfaults while walking native heap

Change-Id: Ifa7eacf14024580d038d42dad96653214b4e4ea5