Merge "Support a new ANDROID_AAPT_IGNORE env var."