8224052: Javadoc doesn't handle non-public intermediate types well

Reviewed-by: jjg
17 files changed