Merge "AAPT2: Add the rest of supported manifest elements"