Also rename T_UNSPEC because an upcoming public header file update will use that name. (cherry picked from commit fc82b0a2) (cherry picked from commit b3b37f1a)