Merge "AAPT2: Accept Java unicode identifiers"