Merge "Revert "Revert "Remove references to SkPorterDuff as it is deprecated."""