Merge "Add static version of dexdump2"