refactor: source and tests#4071

IgorEisberg merged 2 commits intomainiBotPeaches/Apktool:mainfrom

code-refactoriBotPeaches/Apktool:code-refactorCopy head branch name to clipboard