Merge \\"Support the -i flag in the new dexdump.\\" am: f4c7dd6658
am: 0bac5583e5

Change-Id: I4363e83090ce335f7594e344c8d2d4ccd4e0851e