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