Merge "Fix typo in AAPT2 error message" into main