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

Change-Id: I9bc6eacb31b426bb13f0907f3b767affd74cd6c2