Merge "AAPT2: Add supported manifest elements"