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

Change-Id: I1f0f5f8073bdb105d6e1961b063e7c57aaff8bc2