Merge "Fix the API compatibility of "UriMatcher#addURI""