Merge "Revert "Revert "Add static version of dexdump2"""
am: a64eaf9023

Change-Id: Ic5c223976942ec069c5f5db1f1de6ec43f408b3f