Merge "Don't abort the build if a repo doesn't have the test/vts/tools/build/." am: 82503887fa
am: 4cfa281a8d

Change-Id: I549915bf81a193cfd9488d2b83de2e9e400dea89