Merge "libbacktrace: correctly number frames when skipping."