Merge "Disable test 674-hiddenapi for cdex+redefine-stress"