Apktool builds fixes