Merge changes Ied2ab927,I16245af7 am: 3b9ba98e9e
am: 2d523d0cc5

* commit '2d523d0cc55a2e267a6321806d79a76cfd6c23f4':
  Silently ignore duplicate heap entries
  Handle segfaults while walking native heap

Change-Id: I4adb378fda838ca0f03e40dc7cb73f17e69195ee