Merge "Add static version of dexdump2"
am: d2d9171a86

Change-Id: I14dd633b89b2983f0ef5931f7749cc81693a10a1