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

Change-Id: I160f03cf654ddeb1db6490e5f9ec859644591308