Merge "Fix test 674-hiddenapi when debuggable." into pi-dev