Update VTK for new testing macros

Change-Id: I2a641355b89688e8f4362f5aa032cd961a9ddc88
Update VTK testing macro usage

Change-Id: I4c8b8e0d144f01816b8eb68436e6fd17dc64e71a
Merge topic 'vtk-test-macro-compat' into next

d11ea1cd Update VTK testing macro usage
d162e574 Update VTK for new testing macros