so remove the svtools ones where there are duplicates, move the svtools
one to vcl when the vcl one is missing

Change-Id: I9e7f77c3088be48bfcbed81e02ff71fa7aeba0d8