Merge "Make aapt2 terminology more inclusive"