Merge "Fix gcstress and gcverify test targets"