Merge "Add missing skips for --redefine-stress"