Merge "Move to the libc++ demangler." am: 89bb586d52 am: 057b4cfa0f
am: 845b8ec4a3

Change-Id: I92783c8f31a44df93c46488e8c667ebe745faa3b