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

Change-Id: Ifb1961bc39bcb914f7b7964a140ec34ae7cb7838