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

Change-Id: Ia393d9839593a6c8ba1c022c6f189b9b884f08d6