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

Change-Id: I63befd4926b3a7d25cb8086ca67eeecacc0ae7cf