Improved apktool detection.