Merge "AAPT2: Fix typo in Config parsing"