Merge "Fix demangle of function names." am: b3959bb47e am: 450613ce71 am: 4efc4d1915
am: ed0cc9b5ba

Change-Id: I0ee7dda37b9c8b0ded79a7a65a47e52780f88c15