Merge "Revert "Revert "Add static version of dexdump2"""