Merge "Revert "Add static version of dexdump2""