Handle segfaults while walking native heap am: ba5d9ff6d9
am: f3a81cadae

* commit 'f3a81cadaef2c7bc5c525609f0d2a186a9bc2fe6':
  Handle segfaults while walking native heap

Change-Id: I3b8407e2447bb05d03f0f5d7ff7a4924cdf38831