[Findit] Fix blame for GIT and uptake bug fix.

tools/findit/stacktrace.py

 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 
 import crash_utils
 
 
 SYZYASAN_STACK_FRAME_PATTERN = re.compile(
@@ skipping 276 matching lines @@
       return None
     except ValueError:
       return None
 
     # Normalize the file path so that it can be compared to repository path.
     (component_path, component_name, file_path) = (
         crash_utils.NormalizePath(file_path, parsed_deps))
 
     # Return a new stack frame object with the parsed information.
     file_name = file_path.split('/')[-1]
+
+    # If we have the common stack frame index pattern, then use it
+    # since it is more reliable.
+    index_match = re.match('\s*#(\d+)\s.*', line)
+    if index_match:
+      stack_frame_index = int(index_match.group(1))
+
     return StackFrame(stack_frame_index, component_path, component_name,
                       file_name, function, file_path, crashed_line_range)
 
   def __getitem__(self, index):
     return self.stack_list[index]
 
   def GetCrashStack(self):
     """Returns the callstack with the highest priority.
 
     Crash stack has priority 0, and allocation/freed/other thread stacks
     get priority 1.
 
     Returns:
       The highest priority callstack in the stacktrace.
     """
     sorted_stacklist = sorted(self.stack_list,
                               key=lambda callstack: callstack.priority)
     return sorted_stacklist[0]