Merge "Make dexdump2 compile for 64bit devices."