Merge "AAPT2: Record source/comments for compound values' children"