Merge "Shifting VTS libs to static_lib entry"