Merge "Revert "AAPT: Allow duplicate attribute definitions if identical"" into nyc-dev