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

Change-Id: Ied3855b5565d8a93d9788096532826d5cd2870da