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

Change-Id: Ifbbf564465552aa06013177c44786f9787545684