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

scripts/stack_core.py

@@ -373,6 +373,14 @@ class TraceConverter:
           apk = None
           if area.endswith(".apk"):
             apk = area
+          else:
+            index = area.rfind(".so!")
+            if index != -1:
+              # Sometimes we'll see something like:
+              #   #01 pc abcd  libart.so!libart.so (offset 0x134000)
+              # Remove everything after the ! and zero the offset value.
+              area = area[0:index + 3]
+              so_offset = 0
             else:
               index = area.rfind(".apk!")
               if index != -1: