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

Change-Id: I942d758028657ba9fbc613a50e4e91bcb62681d4