Merge "Strip more SymbolInfo from dump" am: ddd86bd217 am: 8cf3e6c7d2 am: d6bde12a27
am: 6f4b00f52a

Change-Id: I074e8c69a8dc57b484b89239d229a9235e04f9e8