Merge "AAPT2: Add script to remove duplicate resource definitions"