Merge "Display offsets for dex frames." am: 659f61e0f2
am: 46f6d348b1

Change-Id: Id42ba551be4d83f5ff023a3f609703cecac1cee0