Merge "Build target for .vts specs." am: 236ff10e93 am: 7db2153245 am: 6bdffca43a
am: f3feb387e8

Change-Id: I46b5802ceb82722bfd6d1591b1155a659ceff438