Merge "AAPT2: Fix small issue with detecting translatable resources"