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

Change-Id: Ib68567b05aee577fbd19e89551b9d6f4be39b27f