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

Change-Id: I6d946e325d921b93b0e89aebd6609764a10f6880