Synchronize LLVM's copy of libc++abi's demangler with the libc++abi

version after r371273.

Also fix a minor issue in r371273 that only surfaced after template
instantiation from LLVM's use of the demangler.

llvm-svn: 371274