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

Change-Id: I0f7f32a3a416157465dc4277ef9d01b7c84a5bd7