Merge "Fix test 674-hiddenapi when debuggable."
am: 8d744d9ea5

Change-Id: I389ef4ebef777b6461972cae2f9ec7c939355def