Merge "AAPT2: Fix issue with resource deduping"