Merge "AAPT2: Update the name of the configuration struct."