Merge to upstream r293166.

There are some demangler bugfixes included here that are needed for
passing the libc++ tests.

Bug: http://b/34740564
Test: make checkbuild && external/libcxx/run_tests.py # saifish
Change-Id: I2f102126d532a18f1ad26d87f8e3915bb50f1bb9