Merge "Fix crash on test failure" am: e7fa3b1b74

am: 9ef9ffb0d0

Change-Id: I259567247b249ed8bb0c0d6cde6e6ed8a837ffd9

cc/cc_test.go

@@ -172,10 +172,7 @@ func TestVendorSrc(t *testing.T) {
 	for _, o := range ld.Inputs {
 		objs = append(objs, o.Base())
 	}
-	if len(objs) != 2 {
-		t.Errorf("inputs of libTest is expected to 2, but was %d.", len(objs))
-	}
-	if objs[0] != "foo.o" || objs[1] != "bar.o" {
+	if len(objs) != 2 || objs[0] != "foo.o" || objs[1] != "bar.o" {
 		t.Errorf("inputs of libTest must be []string{\"foo.o\", \"bar.o\"}, but was %#v.", objs)
 	}
 }