Merge "Support the -i flag in the new dexdump."