Merge "AAPT2: Fix multi APK output"