Merge "Use updated factory for SkOverdrawColorFilter"