[automerger skipped] Merge "Fix test 674-hiddenapi when debuggable." into pi-dev
am: 5043a9a03e  -s ours

Change-Id: I55b56fb958047f00035b4c47212d1a75185dd399