Merge "Disable test 674-hiddenapi for cdex+redefine-stress"
am: 09f86297e7

Change-Id: I93e7e825304e6207c1df6bd849d808bc38fa773a