Merge "Fix a few demangler issues."
am: ecff589728

Change-Id: I4cd74455f1055ab02c0599035e3d789ce8a97520