Merge "Revert "Revert "Add static version of dexdump2""" am: a64eaf90 am: 118ee320 am: f0ea06c5 am: 33eb1027 Change-Id: I69317d01e804dfb1ea3c457ce02ee7f678387e2e