demangle: add a couple of substitution candidates
demangle: add a couple of substitution candidates

This is based on reading the ABI.  It doesn't affect any existing test
cases, and I don't have any new test cases.

ianlancetaylor/demangle