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

Change-Id: I5381f340ec250f7c12d66231b1644c17c01d02f6