Merge "native_heapdump_viewer_tests: update ParseNativeHeap() to pass 4 arguments" am: 3a5c7924 am: 89fc7d5d am: b9f002be Change-Id: If83045b7ce6f96e14a6e51722f26d7fb260321bc