Merge "Fix the offset of $dexfile debug symbol."
am: 26037dd60d

Change-Id: I675feb2c828be974825e8919c977574cceb14200