Merge "upgrade external/gcc-demangle"