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

* commit '26ce1e1234d441dcb830986baed846ce75c72565':
  Silently ignore duplicate heap entries
  Handle segfaults while walking native heap

Change-Id: Ic2e90efaab11370667f761005e549758238f7737