Merge "Implement a simple demangler." am: 3f4f1a1a4a am: 9cd41b3798
am: ade3505fc3

Change-Id: Ie0b21f3a097ece77a375d63069f87d084afa627e