Merge changes Ied2ab927,I16245af7
am: 3b9ba98e9e

* commit '3b9ba98e9eda85baa6f08409177fd1f23307b2d0':
  Silently ignore duplicate heap entries
  Handle segfaults while walking native heap

Change-Id: I8d240cc6cd4b8ffe37a7ea68587546634cb756c9