Use better aapt choices where possible