Merge "native_heapdump_viewer_tests: update ParseNativeHeap() to pass 4 arguments"
am: 3a5c7924a3

Change-Id: I1ee7f0962d6f1258f4d84c424d53d42b94de1dda