Merge "Handle multiple packages of same name in 'aapt2 convert'"