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

Change-Id: I037e8c6cc9d8dab4be08c6533a17191ddbf198a0