8170392: JDK-8031567 broke builds from source bundles

Reviewed-by: sla
2 files changed