Merge "Fix a few demangler issues." am: ecff589728 am: bb5b8ab90d
am: 13ce76d44d

Change-Id: I47514ca11832f68137681f0405158168b6f1c4a9