CDK-472: Move URIBuilder to spi