Pull changes from JesusFreke/Dexlib redesign