Merge "AAPT2: Fix issue with enums and integer attributes"