Merge "Add support for xxx.so!xxx.so lines."