Merge "Remove all non-porterduff xfermodes from the public API" into nyc-dev