Merge "AAPT2: Update SDK development codename to P"