Merge "Modify any lines with libc.so!libc.so to libc.so." am: d6ba6d2400 am: 7a20156f00 am: 83cb4bdc01 am: 912a6f4669 am: c32bda9ed0

Original change: https://android-review.googlesource.com/c/platform/development/+/2089004

Change-Id: I09302855a4fff97ca36b939c2a5031dd746b2fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

scripts/stack_core.py

@@ -487,6 +487,13 @@ class TraceConverter:
                 apk = area[0:index + 4]
           if apk:
             lib_name, lib = self.GetLibFromApk(apk, so_offset)
+        else:
+          # Sometimes we'll see something like:
+          #   #01 pc abcd  libart.so!libart.so
+          # Remove everything after the !.
+          index = area.rfind(".so!")
+          if index != -1:
+            area = area[0:index + 3]
         if not lib:
           lib = area
           lib_name = None