Merge "Support codename T in aapt2"