Merge "AAPT2: Add missing error statement"