Merge "monkeyrunner: update references to ViewNode from hv"