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

Change-Id: Id29f4fd60d6f753ca97f9cee968bd335a23b0497