Toolkit has traditionally had a very odd lifecycle relationship
with VCL - start to fix that; first partial cut.

Change-Id: I77e5e62ebde101d32746d12d83dae92c49970001