vcl: Windows build fix - squash me into  re-init ...

Change-Id: Ieef945c9694b227376362b032feb3603a6921f41
vcl: improve vcldemo & outdev test.

Change-Id: I1ebc3c3b3cffabc8ba446ecd45ac2d9b0d45aff1