Merge "Move hiddenapi to ClassAccessor"