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

Change-Id: I5e6abe72c0236889928770d600600d8f2b9499af