Merge "Fix the offset of $dexfile debug symbol."