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

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