Merge "AAPT2: Revert warning when merging packages"