This fix updates java.net.URI and replaces the ThreadLocalCoders optimization. Reviewed-by: alanb, dfuchs