Merge "libbacktrace: correctly number frames when skipping." am: b5f090d870
am: b57a60c0bd

Change-Id: I5e2e0488198da5931bb39262ddbf7b85145b44b1