Merge "Add extra frame when dex_pc is non-zero."