Merge "wvtest: fix build breakage"