tree 43381406b927ad0b1e121d36fb50e30c47a1f5cb
parent 67e4d55dd44cfde34898ee254e0dc7a13174b6b7
parent bbc382495782e980be9f1a01cfef2bfc993108f0
author Dan Albert <danalbert@google.com> 1485544323 -0800
committer Dan Albert <danalbert@google.com> 1485544743 -0800

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