apktool: merging moar upstream changes from iBotPeaches

PS: release binary

Change-Id: Iae894d1032a6dccfad55ca800db6d8651a79ddb5