Merge "dexdump2 won't be optional when it replaces dexdump."