Merge "Do not run 999-redefine-hiddenapi under jvm/redefine-stress"