Merge "AAPT2: Fix regression in Manifest.java permissions"