Merge "aapt2: Fix issue with Manifest duplicate handling"