Merge "Strip more SymbolInfo from dump"
am: ddd86bd217

Change-Id: I4697c148b58507848ecc46452266263c46fd1394