Merge "libcore: rewrite of UriCodec"