Merge "AAPT2: Prevent duplicate enums/flags"