am c7e0da52: Merge "dexdump2 won\'t be optional when it replaces dexdump."

* commit 'c7e0da5292e841f6a864dd010bd6e0b06e0ece73':
  dexdump2 won't be optional when it replaces dexdump.