Merge "Do not mark static libs as vts artifacts" into pi-dev am: 3674ddf5b9
am: 297a09d1ac

Change-Id: Ic85ca8f769ec6b7285596e427f2d75179f36f43d