Merge "AAPT2: Rename to match new style"