Merge "add comment about xor not being porter/duff Bug: 21934855"