Merge "AAPT2: Fix styled string whitespace processing"