Merge "Add extra frame when dex_pc is non-zero."
am: 0ad424358c

Change-Id: I829267e02fa1342d09923c9087e3a4f3f9d63b1d