Merge "libcore: fix errors in UriCodec"