Merge "AAPT2: Fix issue with parsing escape sequences when the parser only gives us part at a time"