Merge "AAPT2: Fix tokenizer to deal with the separator as last char"