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

Change-Id: I1c964998a08043addc79f10546bca7659c6bac73