Merge "Linker: Use parentheses by default in userToolLinksRedContribs()"