Merge "Do not mark static libs as vts artifacts" into pi-dev