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

Change-Id: I20aa63896d80e4243f3bd1e0398d849ac4612423