Merge "Strip more SymbolInfo from dump"