Merge "AAPT2: Fix issue with styled string indices"