Fix errors from merge conflict resolution

Errors were made in manual conflict resolution in commit
a37a38464aeef5ef2eee77b8463f975d6ffa34af (and subsequently
in commit bb9054772d76fde416af3c0e18f98999daa65bd8).

This change resolves:

1. A syntax error that occured due to a missing curly brace.
2. A few tag variables that didn't get renamed properly.
3. Check for UNKNOWN_PARAM_TAG_NAME error was duplicated twice.
4. Preserved isTypeParameter() check for UNKNOWN_PARAM_TAG_NAME

Change-Id: I1b79ced0a9803f6487aa5b073b700c0c6d5dafdd
1 file changed