am 6d6f574e: Merge "libcore: rewrite of UriCodec"

* commit '6d6f574e762052ccc8ed6791f2a267c66b0288d5':
  libcore: rewrite of UriCodec