V2.1 - Don't use renamed aapt anymore