Merge "Refactor native heap viewer to add tests." am: cd2f1cfed2
am: 9669de4c9e

Change-Id: I04d1a0972aea856517bbe6525a17e60cc8db8536