Merge "Add support for xxx.so!xxx.so lines." am: 197cd3d795 am: dc6db11f99 am: 094e559462

Change-Id: I55765fa70a454a849f53d59a255f225f7f49aa23