Merge "Revert "Add UrlSpanFactory to Linkify""