Merge "AAPT2: improve some error messages"