Merge "Implement a simple demangler."
am: 3f4f1a1a4a

Change-Id: I744cd4fcb5f731bb1f5ed32e3dcde2ff303ee9f4