Merge "Shifting VTS libs to static_lib entry" into sc-dev