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

Change-Id: I3414b6d9ce6d6251fd37d396937c43fbe7bb2cd6